Refactoring + cleanup

od
Laurent 6 years ago
parent 5fe20f8f0b
commit 91f8b11cce
  1. 15
      app/src/main/java/net/pokeranalytics/android/calculus/Report.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
  3. 2
      app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollReportManager.kt

@ -9,7 +9,6 @@ import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.model.filter.Query
import net.pokeranalytics.android.model.filter.QueryCondition
import net.pokeranalytics.android.model.interfaces.GraphIdentifiableEntry
//import net.pokeranalytics.android.model.interfaces.Timed
import net.pokeranalytics.android.model.realm.ComputableResult
import net.pokeranalytics.android.model.realm.Filter
import net.pokeranalytics.android.model.realm.SessionSet
@ -178,8 +177,8 @@ class ComputableGroup(var query: Query, var stats: List<Stat>? = null) {
}
class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValues: Boolean = false) :
GraphUnderlyingEntry {
class ComputedResults(group: ComputableGroup,
shouldManageMultiGroupProgressValues: Boolean = false) : GraphUnderlyingEntry {
/**
* The session group used to computed the statIds
@ -194,9 +193,9 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu
private var shouldManageMultiGroupProgressValues = shouldManageMultiGroupProgressValues
fun allStats(): Collection<ComputedStat> {
return this._computedStats.values
}
private val allStats: Collection<ComputedStat>
get() { return this._computedStats.values }
/**
* Adds a value to the evolution values
@ -246,7 +245,7 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu
fun computeProgressValues(computedResults: ComputedResults) {
this.allStats().forEach { computedStat ->
this.allStats.forEach { computedStat ->
val stat = computedStat.stat
computedResults.computedStat(stat)?.let { previousComputedStat ->
when (stat) {
@ -281,7 +280,7 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu
val bbSessionCount = this.computedStat(Stat.BB_SESSION_COUNT)?.progressValue
val totalBuyin = this.computedStat(Stat.TOTAL_BUYIN)?.progressValue
this.allStats().forEach { computedStat ->
this.allStats.forEach { computedStat ->
when (computedStat.stat) {
Stat.HOURLY_RATE -> {
if (netResult != null && duration != null) {

@ -17,9 +17,7 @@ import java.util.*
import kotlin.math.exp
import kotlin.math.pow
class StatFormattingException(message: String) : Exception(message) {
}
class StatFormattingException(message: String) : Exception(message)
/**
* An enum representing all the types of Session statistics

@ -15,7 +15,7 @@ import kotlin.coroutines.CoroutineContext
object BankrollReportManager {
val coroutineContext: CoroutineContext
private val coroutineContext: CoroutineContext
get() = Dispatchers.Main
private var reports: MutableMap<String?, BankrollReport> = mutableMapOf()

Loading…
Cancel
Save