diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt index 9a22521c..28875170 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt @@ -10,6 +10,9 @@ import net.pokeranalytics.android.model.realm.ComputableResult import net.pokeranalytics.android.model.realm.Filter import net.pokeranalytics.android.model.realm.SessionSet +/** + * The class returned after performing calculation in the Calculator object + */ class Report() { private var _results: MutableList = mutableListOf() @@ -32,6 +35,19 @@ class Report() { this._results.add(result) } + fun barEntries(stat: Stat): List { + val entries = mutableListOf() + + this._results.forEachIndexed { index, results -> + val cs = results.computedStat(stat) + cs?.let { computedStat -> + entries.add(Entry(index.toFloat(), computedStat.value.toFloat(), results.group)) + } + } + return entries + } + + } /** diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt index 01b652b1..b8ff79ef 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt @@ -191,11 +191,4 @@ class ComputedStat(var stat: Stat, var value: Double, var currency: Currency? = return this.stat.format(this.value, this.currency, context) } - /** - * Returns a TextFormat instance for an evolution value located at the specified [index] - */ - fun evolutionValueFormat(index: Int): TextFormat { - return TextFormat("undef ${index}") - } - }