|
|
|
|
@ -144,21 +144,21 @@ class Calculator { |
|
|
|
|
tBuyinSum += s.ratedBuyin |
|
|
|
|
tHands += s.estimatedHands |
|
|
|
|
|
|
|
|
|
results.addEvolutionValue(tSum, NETRESULT) |
|
|
|
|
results.addEvolutionValue(tSum / index, AVERAGE) |
|
|
|
|
results.addEvolutionValue(index.toDouble(), NUMBER_OF_GAMES) |
|
|
|
|
results.addEvolutionValue(tBBSum / tBBSessionCount, AVERAGE_NET_BB) |
|
|
|
|
results.addEvolutionValue((tWinningSessionCount / index).toDouble(), WIN_RATIO) |
|
|
|
|
results.addEvolutionValue(tBuyinSum / index, AVERAGE_BUYIN) |
|
|
|
|
results.addEvolutionValue(tSum, NETRESULT, s) |
|
|
|
|
results.addEvolutionValue(tSum / index, AVERAGE, s) |
|
|
|
|
results.addEvolutionValue(index.toDouble(), NUMBER_OF_GAMES, s) |
|
|
|
|
results.addEvolutionValue(tBBSum / tBBSessionCount, AVERAGE_NET_BB, s) |
|
|
|
|
results.addEvolutionValue((tWinningSessionCount / index).toDouble(), WIN_RATIO, s) |
|
|
|
|
results.addEvolutionValue(tBuyinSum / index, AVERAGE_BUYIN, s) |
|
|
|
|
|
|
|
|
|
val netBB100 = Stat.netBBPer100Hands(tBBSum, tHands) |
|
|
|
|
if (netBB100 != null) { |
|
|
|
|
results.addEvolutionValue(netBB100, NET_BB_PER_100_HANDS) |
|
|
|
|
results.addEvolutionValue(netBB100, NET_BB_PER_100_HANDS, s) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
val roi = Stat.returnOnInvestment(tSum, tBuyinSum) |
|
|
|
|
if (roi != null) { |
|
|
|
|
results.addEvolutionValue(roi, ROI) |
|
|
|
|
results.addEvolutionValue(roi, ROI, s) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
@ -201,19 +201,19 @@ class Calculator { |
|
|
|
|
tHourlyRate = gSum / tHourlyDuration |
|
|
|
|
tHourlyRateBB = gBBSum / tHourlyDuration |
|
|
|
|
|
|
|
|
|
results.addEvolutionValue(tSum, tHourlyDuration, NETRESULT) |
|
|
|
|
results.addEvolutionValue(tSum / tHourlyDuration, tHourlyDuration, HOURLY_RATE) |
|
|
|
|
results.addEvolutionValue(tHourlyRate, tHourlyDuration, HOURLY_RATE) |
|
|
|
|
results.addEvolutionValue(tIndex.toDouble(), tHourlyDuration, NUMBER_OF_SETS) |
|
|
|
|
results.addEvolutionValue(sessionSet.netDuration.toDouble(), tHourlyDuration, DURATION) |
|
|
|
|
results.addEvolutionValue(tHourlyDuration / tIndex, tHourlyDuration, AVERAGE_DURATION) |
|
|
|
|
results.addEvolutionValue(tHourlyRateBB, tHourlyDuration, HOURLY_RATE_BB) |
|
|
|
|
results.addEvolutionValue(tSum, tHourlyDuration, NETRESULT, sessionSet) |
|
|
|
|
results.addEvolutionValue(tSum / tHourlyDuration, tHourlyDuration, HOURLY_RATE, sessionSet) |
|
|
|
|
results.addEvolutionValue(tHourlyRate, tHourlyDuration, HOURLY_RATE, sessionSet) |
|
|
|
|
results.addEvolutionValue(tIndex.toDouble(), tHourlyDuration, NUMBER_OF_SETS, sessionSet) |
|
|
|
|
results.addEvolutionValue(sessionSet.netDuration.toDouble(), tHourlyDuration, DURATION, sessionSet) |
|
|
|
|
results.addEvolutionValue(tHourlyDuration / tIndex, tHourlyDuration, AVERAGE_DURATION, sessionSet) |
|
|
|
|
results.addEvolutionValue(tHourlyRateBB, tHourlyDuration, HOURLY_RATE_BB, sessionSet) |
|
|
|
|
|
|
|
|
|
val netBB100 = Stat.netBBPer100Hands(gBBSum, gTotalHands) |
|
|
|
|
if (netBB100 != null) { |
|
|
|
|
results.addEvolutionValue(netBB100, tHourlyDuration, NET_BB_PER_100_HANDS) |
|
|
|
|
results.addEvolutionValue(netBB100, tHourlyDuration, NET_BB_PER_100_HANDS, sessionSet) |
|
|
|
|
} else { //@todo maybe not |
|
|
|
|
results.addEvolutionValue(0.0, tHourlyDuration, NET_BB_PER_100_HANDS) |
|
|
|
|
results.addEvolutionValue(0.0, tHourlyDuration, NET_BB_PER_100_HANDS, sessionSet) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|