staxriver
/
poker-analytics
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar: Adding missing stats + fixing max duration format

Browse Source
feature/top10
Laurent 7 years ago
parent f1ad203ae2
commit a0c738e1c5
3 changed files with 8 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt
  3. 7
      app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt

2
app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
Unescape View File

@ -408,7 +408,7 @@ class Calculator {
results.addStat(MINIMUM_NETRESULT, min) results.addStat(MINIMUM_NETRESULT, min)
} }
maxDuration?.let { maxd -> maxDuration?.let { maxd ->
results.addStat(MAXIMUM_DURATION, maxd) results.addStat(MAXIMUM_DURATION, maxd / 3600000) // (milliseconds to hours)
} }
val bbPer100Hands = bbSum / totalHands * 100 val bbPer100Hands = bbSum / totalHands * 100

4
app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt
Unescape View File

@ -102,11 +102,11 @@ class CalendarDetailsFragment : PokerAnalyticsFragment(), StaticRowRepresentable
rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.LOCATIONS_PLAYED), computedResults.computedStat(Stat.LONGEST_STREAKS))) rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.LOCATIONS_PLAYED), computedResults.computedStat(Stat.LONGEST_STREAKS)))
rowRepresentables.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, resId = R.string.distribution)) rowRepresentables.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, resId = R.string.distribution))
rowRepresentables.add(GraphRow(Stat.NETRESULT, null, "")) rowRepresentables.add(GraphRow(Stat.NETRESULT, null, ""))
rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.WIN_RATIO))) rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.WIN_RATIO), computedResults.computedStat(Stat.MAXIMUM_NETRESULT)))
rowRepresentables.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, resId = R.string.volume)) rowRepresentables.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, resId = R.string.volume))
rowRepresentables.add(GraphRow(Stat.NETRESULT, null, "")) rowRepresentables.add(GraphRow(Stat.NETRESULT, null, ""))
rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.DURATION), computedResults.computedStat(Stat.AVERAGE_DURATION))) rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.DURATION), computedResults.computedStat(Stat.AVERAGE_DURATION)))
rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.DAYS_PLAYED))) rowRepresentables.add(StatDoubleRow(computedResults.computedStat(Stat.DAYS_PLAYED), computedResults.computedStat(Stat.MAXIMUM_DURATION)))
//computedResults.group.conditions //computedResults.group.conditions

7
app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
Unescape View File

@ -238,8 +238,11 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep
else -> listOf(Comparator.YEAR, Comparator.MONTH_OF_YEAR).combined() else -> listOf(Comparator.YEAR, Comparator.MONTH_OF_YEAR).combined()
} }
val requiredStats: List<Stat> = listOf(Stat.LOCATIONS_PLAYED, Stat.LONGEST_STREAKS, Stat.DAYS_PLAYED)
val options = Calculator.Options(evolutionValues = Calculator.Options.EvolutionValues.STANDARD, stats = requiredStats)
monthConditions.forEach { conditions -> monthConditions.forEach { conditions ->
val report = Calculator.computeStatsWithComparators(realm, conditions = conditions, options = Calculator.Options())
val report = Calculator.computeStatsWithComparators(realm, conditions = conditions, options = options)
report.results.forEach { computedResults -> report.results.forEach { computedResults ->
if (!computedResults.isEmpty) { if (!computedResults.isEmpty) {
// Set date data // Set date data
@ -267,7 +270,7 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep
} }
yearConditions.forEach { conditions -> yearConditions.forEach { conditions ->
val report = Calculator.computeStatsWithComparators(realm, conditions = conditions, options = Calculator.Options()) val report = Calculator.computeStatsWithComparators(realm, conditions = conditions, options = options)
report.results.forEach { computedResults -> report.results.forEach { computedResults ->
if (!computedResults.isEmpty) { if (!computedResults.isEmpty) {
// Set date data // Set date data

Write Preview
Loading…
Cancel
Save