diff --git a/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt index f81f2a2e..34fd0667 100644 --- a/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt +++ b/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt @@ -168,23 +168,23 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() { Assert.fail("No netbbPer100Hands stat") } - val stdHourly = results.computedStat(Stat.STANDARD_DEVIATION_HOURLY) - if (stdHourly != null) { - assertEquals(141.42, stdHourly.value, delta) - } else { - Assert.fail("No stdHourly stat") - } - val std = results.computedStat(Stat.STANDARD_DEVIATION) if (std != null) { - assertEquals(282.84, std.value, delta) + assertEquals(200.0, std.value, delta) } else { Assert.fail("No std stat") } + val stdHourly = results.computedStat(Stat.STANDARD_DEVIATION_HOURLY) + if (stdHourly != null) { + assertEquals(50.0, stdHourly.value, delta) + } else { + Assert.fail("No stdHourly stat") + } + val std100 = results.computedStat(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS) if (std100 != null) { - assertEquals(707.1, std100.value, delta) + assertEquals(250.0, std100.value, delta) } else { Assert.fail("No std100 stat") } diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt index 348d4312..863ba2e3 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt @@ -181,12 +181,16 @@ class Calculator { if (options.shouldComputeStandardDeviation()) { var stdSum: Double = 0.0 + var stdBBper100HandsSum: Double = 0.0 sessions.forEach { s -> stdSum += Math.pow(s.value - average, 2.0) + stdBBper100HandsSum += Math.pow(s.bbPer100Hands - hourlyRate, 2.0) } val standardDeviation: Double = Math.sqrt(stdSum / sessions.size) + val standardDeviationBBper100Hands: Double = Math.sqrt(stdBBper100HandsSum / sessionSets.size) var hourlyStdSum: Double = 0.0 + sessionSets.forEach { sg -> hourlyStdSum += Math.pow(sg.hourlyRate - hourlyRate, 2.0) } @@ -194,7 +198,8 @@ class Calculator { results.addStats(setOf( ComputedStat(STANDARD_DEVIATION, standardDeviation), - ComputedStat(STANDARD_DEVIATION_HOURLY, hourlyStandardDeviation) + ComputedStat(STANDARD_DEVIATION_HOURLY, hourlyStandardDeviation), + ComputedStat(STANDARD_DEVIATION_BB_PER_100_HANDS, standardDeviationBBper100Hands) )) } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index 7f328946..39055af6 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -218,6 +218,12 @@ open class Session : RealmObject(), SessionInterface, RowRepresentableDataSource return 0.0 } + @Ignore + var bbPer100Hands: Double = 0.0 + get() { + return this.bbNetResult / this.estimatedHands * 100.0 + } + @Ignore override var bigBlindSessionCount: Int = if (this.cgBigBlind != null) 1 else 0