From 470aaee54ce6074145d9d682cfab77973ce71321 Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 16 Apr 2019 15:37:11 +0200 Subject: [PATCH] alpha of evo aggregation --- .../android/ui/activity/CalendarDetailsActivity.kt | 5 +++-- .../ui/activity/StatisticDetailsActivity.kt | 5 +++-- .../android/ui/fragment/GraphFragment.kt | 14 +++++++------- .../ui/fragment/StatisticDetailsFragment.kt | 2 +- .../android/ui/fragment/StatsFragment.kt | 8 ++------ 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/CalendarDetailsActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/CalendarDetailsActivity.kt index 53563031..fa20b04a 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/CalendarDetailsActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/CalendarDetailsActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import net.pokeranalytics.android.R +import net.pokeranalytics.android.calculus.ComputableGroup import net.pokeranalytics.android.calculus.Report import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity @@ -30,8 +31,8 @@ class CalendarDetailsActivity : PokerAnalyticsActivity() { context.startActivity(intent) } - fun newInstance(context: Context, stat: Stat, report: Report) { - parameters = GraphParameters(stat, report) + fun newInstance(context: Context, stat: Stat, group: ComputableGroup, report: Report) { + parameters = GraphParameters(stat, group, report) val intent = Intent(context, CalendarDetailsActivity::class.java) context.startActivity(intent) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/StatisticDetailsActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/StatisticDetailsActivity.kt index 5a2b4d39..35349fc7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/StatisticDetailsActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/StatisticDetailsActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import net.pokeranalytics.android.R +import net.pokeranalytics.android.calculus.ComputableGroup import net.pokeranalytics.android.calculus.Report import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity @@ -25,8 +26,8 @@ class StatisticDetailsActivity : PokerAnalyticsActivity() { /** * Default constructor */ - fun newInstance(context: Context, stat: Stat, report: Report) { - parameters = GraphParameters(stat, report) + fun newInstance(context: Context, stat: Stat, group: ComputableGroup, report: Report) { + parameters = GraphParameters(stat, group, report) val intent = Intent(context, StatisticDetailsActivity::class.java) context.startActivity(intent) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt index 9f3d5794..18ce6f6c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt @@ -30,7 +30,7 @@ import java.text.DateFormat import java.util.* import kotlin.coroutines.CoroutineContext -class GraphParameters(var stat: Stat, var report: Report) { +class GraphParameters(var stat: Stat, var computableGroup: ComputableGroup, var report: Report) { } @@ -40,8 +40,9 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co private var stat: Stat = Stat.NETRESULT private var reports: MutableMap = hashMapOf() + lateinit private var computableGroup: ComputableGroup - private var selectedReport: Report? = null + lateinit private var selectedReport: Report lateinit var legendView: LegendView lateinit var chartView: BarLineChartBase<*> @@ -55,8 +56,9 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co } - fun setData(stat: Stat, report: Report) { + fun setData(stat: Stat, group: ComputableGroup, report: Report) { this.stat = stat + this.computableGroup = group this.aggregationTypes = stat.aggregationTypes this.reports[this.aggregationTypes.first()] = report @@ -84,9 +86,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co this.legendView = LegendView(requireContext()) this.legendContainer.addView(this.legendView) - this.selectedReport?.let { - this.loadGraph(it) - } + this.loadGraph(this.selectedReport) this.aggregationTypes.forEach { type -> val chip = Chip(requireContext()) @@ -127,7 +127,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co val realm = Realm.getDefaultInstance() val aggregationType = stat.aggregationTypes.first() -// r = Calculator.computeStatsWithEvolutionByAggregationType(realm, computableGroup, aggregationType) + r = Calculator.computeStatsWithEvolutionByAggregationType(realm, computableGroup, aggregationType) realm.close() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt index bb5d8ad0..26401474 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt @@ -61,7 +61,7 @@ class StatisticDetailsFragment : PokerAnalyticsFragment() { fragmentTransaction.commit() StatisticDetailsActivity.parameters?.let { - fragment.setData(it.stat, it.report) + fragment.setData(it.stat, it.computableGroup, it.report) StatisticDetailsActivity.parameters = null } ?: run { throw Exception("Missing graph parameters") diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt index 32e2b523..4e66f0ec 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt @@ -10,7 +10,6 @@ import kotlinx.android.synthetic.main.fragment_stats.* import kotlinx.coroutines.* import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.* -import net.pokeranalytics.android.ui.view.rowrepresentable.StatRow import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.ui.activity.StatisticDetailsActivity import net.pokeranalytics.android.ui.adapter.DisplayDescriptor @@ -20,6 +19,7 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.fragment.components.SessionObserverFragment import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable +import net.pokeranalytics.android.ui.view.rowrepresentable.StatRow import net.pokeranalytics.android.util.NULL_TEXT import timber.log.Timber import java.util.* @@ -245,14 +245,10 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc Timber.d(">>> start...") val realm = Realm.getDefaultInstance() -// val options = Calculator.Options() -// options.evolutionValues = Calculator.Options.EvolutionValues.STANDARD -// options.displayedStats = listOf(stat) val aggregationType = stat.aggregationTypes.first() report = Calculator.computeStatsWithEvolutionByAggregationType(realm, computableGroup, aggregationType) -// report = Calculator.computeGroups(realm, listOf(computableGroup), options) realm.close() val e = Date() @@ -263,7 +259,7 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc test.await() if (!isDetached) { - StatisticDetailsActivity.newInstance(requireContext(), stat, report) + StatisticDetailsActivity.newInstance(requireContext(), stat, computableGroup, report) } }