Passing standard deviation tests

feature/top10
Laurent 7 years ago
parent f900a89e4e
commit 4624578fcd
  1. 4
      app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
  3. 3
      app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt

@ -177,14 +177,14 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
val stdHourly = results.computedStat(Stat.STANDARD_DEVIATION_HOURLY) val stdHourly = results.computedStat(Stat.STANDARD_DEVIATION_HOURLY)
if (stdHourly != null) { if (stdHourly != null) {
assertEquals(50.0, stdHourly.value, delta) assertEquals(111.8, stdHourly.value, delta)
} else { } else {
Assert.fail("No stdHourly stat") Assert.fail("No stdHourly stat")
} }
val std100 = results.computedStat(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS) val std100 = results.computedStat(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS)
if (std100 != null) { if (std100 != null) {
assertEquals(250.0, std100.value, delta) assertEquals(559.01, std100.value, delta)
} else { } else {
Assert.fail("No std100 stat") Assert.fail("No std100 stat")
} }

@ -194,8 +194,8 @@ class Calculator {
// Session Set // Session Set
var hourlyStdSum: Double = 0.0 var hourlyStdSum: Double = 0.0
sessionSets.forEach { sg -> sessionSets.forEach { set ->
hourlyStdSum += Math.pow(sg.hourlyRate - hourlyRate, 2.0) hourlyStdSum += Math.pow(set.hourlyRate - hourlyRate, 2.0)
} }
val hourlyStandardDeviation: Double = Math.sqrt(hourlyStdSum / sessionSets.size) val hourlyStandardDeviation: Double = Math.sqrt(hourlyStdSum / sessionSets.size)

@ -41,6 +41,9 @@ open class SessionSet() : RealmObject() {
@Ignore // a duration shortcut @Ignore // a duration shortcut
var hourlyRate: Double = 0.0 var hourlyRate: Double = 0.0
get () {
return this.netResult / this.hourlyDuration
}
@Ignore @Ignore
var estimatedHands: Double = 25.0 * (this.timeFrame?.hourlyDuration?.toDouble() ?: 0.0) var estimatedHands: Double = 25.0 * (this.timeFrame?.hourlyDuration?.toDouble() ?: 0.0)

Loading…
Cancel
Save