Merge branch 'dev' of gitlab.com:stax-river/poker-analytics into dev

app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt

@@ -251,7 +251,7 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() {
 		}
 
 		results.computedStat(Stat.MAXIMUM_DURATION)?.let {
-			assertEquals(3.0 * 3600 * 1000, it.value, delta)
+			assertEquals(3.0, it.value, delta)
 		} ?: run {
 			Assert.fail("No MAXIMUM_DURATION")
 		}
@@ -650,8 +650,6 @@ class StatsInstrumentedUnitTest : RealmInstrumentedUnitTest() {
 
 		}
 
-		val computableResults = realm.where(ComputableResult::class.java).findAll()
-		val sets = realm.where(SessionSet::class.java).findAll()
 		val stats: List<Stat> = listOf(Stat.NETRESULT)
 		val group = ComputableGroup("test", listOf(), stats)
 		val options = Calculator.Options()

app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt

@@ -55,15 +55,19 @@ class Calculator {
 		/**
 		 * This function determines whether the standard deviation should be computed
 		 */
-		fun shouldComputeStandardDeviation(): Boolean {
+		val computeStandardDeviation: Boolean
-			this.displayedStats.forEach { stat ->
+			get() {
-				return when (stat) {
+				this.displayedStats.forEach {
-					STANDARD_DEVIATION, STANDARD_DEVIATION_HOURLY, STANDARD_DEVIATION_BB_PER_100_HANDS -> true
+					if (it == STANDARD_DEVIATION_BB_PER_100_HANDS || it == STANDARD_DEVIATION || it == STANDARD_DEVIATION_HOURLY) {
-					else -> false
+						return true
+					}
 				}
+				return false
 			}
-			return true
+
-		}
+		val computeLongestStreak = this.displayedStats.contains(LONGEST_STREAKS)
+		val computeLocationsPlayed = this.displayedStats.contains(LOCATIONS_PLAYED)
+		val computeDaysPlayed = this.displayedStats.contains(DAYS_PLAYED)
 
 	}
 
@@ -163,8 +167,7 @@ class Calculator {
 			val computables = computableGroup.computables(realm)
 			Timber.d(">>>> Start computing group ${computableGroup.name}, ${computables.size} computables")
 
-			val computeLongestStreak = options.displayedStats.contains(LONGEST_STREAKS)
+			if (options.computeLongestStreak) {
-			if (computeLongestStreak) {
 				computables.sort("session.startDate")
 			}
 
@@ -180,12 +183,12 @@ class Calculator {
 			val maxNetResult = computables.max(ComputableResult.Field.RATED_NET.identifier)?.toDouble()
 			val minNetResult = computables.min(ComputableResult.Field.RATED_NET.identifier)?.toDouble()
 
-			if (options.displayedStats.contains(LOCATIONS_PLAYED)) {
+			if (options.computeLocationsPlayed) {
 				results.addStat(LOCATIONS_PLAYED, computables.distinctBy { it.session?.location?.id }.size.toDouble())
 			}
 
 			val shouldIterateOverComputables =
-				(options.evolutionValues == Options.EvolutionValues.STANDARD || computeLongestStreak)
+				(options.evolutionValues == Options.EvolutionValues.STANDARD || options.computeLongestStreak)
 
 			// Iterate for each session
 			if (shouldIterateOverComputables) {
@@ -271,10 +274,9 @@ class Calculator {
 			val hourlyRate = gSum / gHourlyDuration
 //			var bbHourlyRate = gBBSum / gDuration
 
-			val computeDaysPlayed = options.displayedStats.contains(DAYS_PLAYED)
+			val shouldIterateOverSets = (options.evolutionValues != Options.EvolutionValues.NONE || options.computeDaysPlayed)
-			val shouldIterateOverSets = (options.evolutionValues != Options.EvolutionValues.NONE || computeDaysPlayed)
 
-			if (computeDaysPlayed) {
+			if (shouldIterateOverSets) {
 
 				var tHourlyDuration = 0.0
 				var tIndex = 0
@@ -414,7 +416,7 @@ class Calculator {
 			val bbPer100Hands = bbSum / totalHands * 100
 
 			// Standard Deviation
-			if (options.shouldComputeStandardDeviation()) {
+			if (options.computeStandardDeviation) {
 
 				// Session
 				var stdSum = 0.0

app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt

@@ -238,7 +238,9 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep
 				else -> listOf(Comparator.YEAR, Comparator.MONTH_OF_YEAR).combined()
 			}
 
-			val requiredStats: List<Stat> = listOf(Stat.LOCATIONS_PLAYED, Stat.LONGEST_STREAKS, Stat.DAYS_PLAYED)
+			val requiredStats: List<Stat> = listOf(Stat.LOCATIONS_PLAYED, Stat.LONGEST_STREAKS, Stat.DAYS_PLAYED,
+				Stat.STANDARD_DEVIATION_HOURLY
+			)
 			val options = Calculator.Options(evolutionValues = Calculator.Options.EvolutionValues.STANDARD, stats = requiredStats)
 			monthConditions.forEach { conditions ->
 

app/src/main/java/net/pokeranalytics/android/util/FakeDataManager.kt

@@ -75,8 +75,9 @@ class FakeDataManager {
 					session.game = games.random()
 
 					session.result?.let { result ->
+						val buyin = buyinList.random()
 						result.buyin = buyinList.random()
-						result.netResult = resultsList.random()
+						result.netResult = resultsList.random() + buyin
 					}
 
 				}