Fix build issue + computation

feature/top10
Laurent 7 years ago
parent fd21a03bc9
commit f900a89e4e
  1. 13
      app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/calculus/Computable.kt
  3. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt

@ -177,20 +177,23 @@ class Calculator {
)) ))
val bbPer100Hands = bbSum / totalHands * 100
// Standard Deviation // Standard Deviation
if (options.shouldComputeStandardDeviation()) { if (options.shouldComputeStandardDeviation()) {
// Session
var stdSum: Double = 0.0 var stdSum: Double = 0.0
var stdBBper100HandsSum: Double = 0.0 var stdBBper100HandsSum: Double = 0.0
sessions.forEach { s -> sessions.forEach { session ->
stdSum += Math.pow(s.value - average, 2.0) stdSum += Math.pow(session.value - average, 2.0)
stdBBper100HandsSum += Math.pow(s.bbPer100Hands - hourlyRate, 2.0) stdBBper100HandsSum += Math.pow(session.bbPer100Hands - bbPer100Hands, 2.0)
} }
val standardDeviation: Double = Math.sqrt(stdSum / sessions.size) val standardDeviation: Double = Math.sqrt(stdSum / sessions.size)
val standardDeviationBBper100Hands: Double = Math.sqrt(stdBBper100HandsSum / sessionSets.size) val standardDeviationBBper100Hands: Double = Math.sqrt(stdBBper100HandsSum / sessions.size)
// Session Set
var hourlyStdSum: Double = 0.0 var hourlyStdSum: Double = 0.0
sessionSets.forEach { sg -> sessionSets.forEach { sg ->
hourlyStdSum += Math.pow(sg.hourlyRate - hourlyRate, 2.0) hourlyStdSum += Math.pow(sg.hourlyRate - hourlyRate, 2.0)
} }

@ -18,6 +18,8 @@ interface SessionInterface : Summable {
var bbNetResult: Double var bbNetResult: Double
var bigBlindSessionCount: Int // 0 or 1 var bigBlindSessionCount: Int // 0 or 1
var buyin: Double var buyin: Double
var bbPer100Hands: Double
} }
/** /**

@ -240,7 +240,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
} }
@Ignore @Ignore
var bbPer100Hands: Double = 0.0 override var bbPer100Hands: Double = 0.0
get() { get() {
return this.bbNetResult / this.estimatedHands * 100.0 return this.bbNetResult / this.estimatedHands * 100.0
} }

Loading…
Cancel
Save