From b78d354b1aa74e3b308ea3695e3ce5d63ae64192 Mon Sep 17 00:00:00 2001 From: Laurent Date: Sun, 21 Apr 2019 17:59:17 +0200 Subject: [PATCH] Remove useless sessionSet field from ComputableResult + delete useless Computable interface --- .../android/calculus/interfaces/Computable.kt | 17 --------------- .../migrations/PokerAnalyticsMigration.kt | 4 ++++ .../android/model/realm/ComputableResult.kt | 21 +++++++++---------- 3 files changed, 14 insertions(+), 28 deletions(-) delete mode 100644 app/src/main/java/net/pokeranalytics/android/calculus/interfaces/Computable.kt diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/interfaces/Computable.kt b/app/src/main/java/net/pokeranalytics/android/calculus/interfaces/Computable.kt deleted file mode 100644 index 4d1eca7c..00000000 --- a/app/src/main/java/net/pokeranalytics/android/calculus/interfaces/Computable.kt +++ /dev/null @@ -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? - -} \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt index c9d63922..3ea96ad8 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt @@ -60,6 +60,10 @@ class PokerAnalyticsMigration : RealmMigration { it.removeField("blindValues") } + schema.get("ComputableResult")?.let { + it.removeField("sessionSet") + } + currentVersion++ } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt index 513040e9..e23f6045 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt @@ -1,33 +1,32 @@ package net.pokeranalytics.android.model.realm import io.realm.RealmObject -import net.pokeranalytics.android.calculus.interfaces.Computable import net.pokeranalytics.android.model.filter.Filterable 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 fun updateWith(session: Session) { - this.sessionSet = session.sessionSet +// this.sessionSet = session.sessionSet val rate = session.bankroll?.currency?.rate ?: 1.0