Remove useless sessionSet field from ComputableResult + delete useless Computable interface

feature/top10
Laurent 7 years ago
parent 8258800cac
commit b78d354b1a
  1. 17
      app/src/main/java/net/pokeranalytics/android/calculus/interfaces/Computable.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
  3. 21
      app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt

@ -1,17 +0,0 @@
package net.pokeranalytics.android.calculus.interfaces
import net.pokeranalytics.android.model.realm.SessionSet
interface Computable {
var ratedNet: Double
var bbNet: Double
var hasBigBlind: Int
var isPositive: Int
var ratedBuyin: Double
var estimatedHands: Double
var bbPer100Hands: Double
var sessionSet: SessionSet?
}

@ -60,6 +60,10 @@ class PokerAnalyticsMigration : RealmMigration {
it.removeField("blindValues") it.removeField("blindValues")
} }
schema.get("ComputableResult")?.let {
it.removeField("sessionSet")
}
currentVersion++ currentVersion++
} }

@ -1,33 +1,32 @@
package net.pokeranalytics.android.model.realm package net.pokeranalytics.android.model.realm
import io.realm.RealmObject import io.realm.RealmObject
import net.pokeranalytics.android.calculus.interfaces.Computable
import net.pokeranalytics.android.model.filter.Filterable import net.pokeranalytics.android.model.filter.Filterable
import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.filter.QueryCondition
open class ComputableResult() : RealmObject(), Computable, Filterable { open class ComputableResult() : RealmObject(), Filterable {
override var ratedNet: Double = 0.0 var ratedNet: Double = 0.0
override var bbNet: BB = 0.0 var bbNet: BB = 0.0
override var hasBigBlind: Int = 0 var hasBigBlind: Int = 0
override var isPositive: Int = 0 var isPositive: Int = 0
override var ratedBuyin: Double = 0.0 var ratedBuyin: Double = 0.0
override var estimatedHands: Double = 0.0 var estimatedHands: Double = 0.0
override var bbPer100Hands: BB = 0.0 var bbPer100Hands: BB = 0.0
override var sessionSet: SessionSet? = null // var sessionSet: SessionSet? = null
var session: Session? = null var session: Session? = null
fun updateWith(session: Session) { fun updateWith(session: Session) {
this.sessionSet = session.sessionSet // this.sessionSet = session.sessionSet
val rate = session.bankroll?.currency?.rate ?: 1.0 val rate = session.bankroll?.currency?.rate ?: 1.0

Loading…
Cancel
Save