From 4624578fcd403ce3799bf013d06e4013493f5914 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Mon, 25 Feb 2019 12:03:38 +0100
Subject: [PATCH] Passing standard deviation tests

---
 .../net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt | 4 ++--
 .../java/net/pokeranalytics/android/calculus/Calculator.kt    | 4 ++--
 .../java/net/pokeranalytics/android/model/realm/SessionSet.kt | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt
index 34fd0667..4ecd4d71 100644
--- a/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt
+++ b/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt
@@ -177,14 +177,14 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
 
         val stdHourly = results.computedStat(Stat.STANDARD_DEVIATION_HOURLY)
         if (stdHourly != null) {
-            assertEquals(50.0, stdHourly.value, delta)
+            assertEquals(111.8, stdHourly.value, delta)
         } else {
             Assert.fail("No stdHourly stat")
         }
 
         val std100 = results.computedStat(Stat.STANDARD_DEVIATION_BB_PER_100_HANDS)
         if (std100 != null) {
-            assertEquals(250.0, std100.value, delta)
+            assertEquals(559.01, 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 c1a9ae52..e97973ff 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
@@ -194,8 +194,8 @@ class Calculator {
 
                 // Session Set
                 var hourlyStdSum: Double = 0.0
-                sessionSets.forEach { sg ->
-                    hourlyStdSum += Math.pow(sg.hourlyRate - hourlyRate, 2.0)
+                sessionSets.forEach { set ->
+                    hourlyStdSum += Math.pow(set.hourlyRate - hourlyRate, 2.0)
                 }
                 val hourlyStandardDeviation: Double = Math.sqrt(hourlyStdSum / sessionSets.size)
 
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt
index d05fad74..659787a8 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt
@@ -41,6 +41,9 @@ open class SessionSet() : RealmObject() {
 
     @Ignore // a duration shortcut
     var hourlyRate: Double = 0.0
+        get () {
+            return this.netResult / this.hourlyDuration
+        }
 
     @Ignore
     var estimatedHands: Double = 25.0 * (this.timeFrame?.hourlyDuration?.toDouble() ?: 0.0)