From 96925f525f7f5f96af6bb6375ab38feddf4e02ee Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 26 Apr 2019 11:06:51 +0200 Subject: [PATCH] cleanup --- .../net/pokeranalytics/android/calculus/Report.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 0ad7a291..4f5cb92e 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt @@ -48,9 +48,7 @@ class Report(var options: Calculator.Options) { statToUse?.let { this._results.forEachIndexed { index, results -> - val stat = results.computedStat(it) - val progressValue = stat?.progressValue - progressValue?.let { progressValue -> + results.computedStat(it)?.progressValue?.let { progressValue -> entries.add(Entry(index.toFloat(), progressValue.toFloat(), results)) } } @@ -73,7 +71,7 @@ class Report(var options: Calculator.Options) { } } - val label = statToUse?.name ?: "" + val label = statToUse?.name ?: "" return DataSetFactory.barDataSetInstance(entries, label, context) } @@ -180,7 +178,8 @@ class ComputableGroup(name: String = "", conditions: List = list } -class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValues: Boolean = false) : GraphUnderlyingEntry { +class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValues: Boolean = false) : + GraphUnderlyingEntry { /** * The session group used to computed the stats @@ -256,7 +255,8 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu val previousValue = previousComputedStat.progressValue ?: 0.0 computedStat.progressValue = previousValue + computedStat.value } - else -> {} + else -> { + } } } ?: run { computedStat.progressValue = computedStat.value @@ -328,7 +328,8 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu computedStat.progressValue = Stat.returnOnInvestment(netResult, totalBuyin) } } - else -> {} + else -> { + } } }