From 775aae94085b94118676df7d81b0969b41153314 Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 19 Apr 2019 13:56:06 +0200 Subject: [PATCH] Optimized distribution sort --- .../pokeranalytics/android/calculus/Report.kt | 20 ++----------------- 1 file changed, 2 insertions(+), 18 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 807b7551..89fa7ca8 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt @@ -330,22 +330,6 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu this.consolidateProgressStats() -// if (options.evolutionValues != Calculator.Options.EvolutionValues.NONE) { -// -// // Sort points as a distribution -// this._computedStats.keys.filter { it.hasDistributionSorting() }.forEach { stat -> -// // @todo sort -// this._evolutionValues[stat]?.let { pointList -> -// -// pointList.sortBy { point -> -// return@sortBy true -// } -// -// } -// -// } -// -// } } // MPAndroidChart @@ -397,6 +381,8 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu val negative = mutableListOf() val positive = mutableListOf() + + points.sortByDescending { it.y } points.forEach { if (it.y < 0) { negative.add(it) @@ -405,8 +391,6 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu } } - negative.sortBy { it.y } - positive.sortByDescending { it.y } negative.forEachIndexed { index, p -> entries.add(BarEntry(index.toFloat(), abs(p.y.toFloat()), p.data))