From f48d79e0ada1a94072c31651937537ff0c3b3538 Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 25 Feb 2020 17:18:40 +0100 Subject: [PATCH] Fixes minimum bet possible amount --- .../ui/modules/handhistory/model/ComputedAction.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt index c8b51bf5..8aa486ca 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ComputedAction.kt @@ -82,7 +82,9 @@ class ComputedAction(var manager: ActionManager, getStreetLastSignificantAction()?.action?.let { lastSignificantAction -> val lastSignificantAmount = lastSignificantAction.amount if (lastSignificantAmount != null) { - val minAmount = lastSignificantAmount + lastSignificantAction.effectiveAmount + val previousSignificantAmount = getStreetSignificantActionBefore(lastSignificantAction.index)?.action?.amount ?: 0.0 + val differenceWithPreviousSignificantAmount = lastSignificantAmount - previousSignificantAmount + val minAmount = lastSignificantAmount + differenceWithPreviousSignificantAmount correctedAmount = max(minAmount, correctedAmount) } } @@ -233,6 +235,10 @@ class ComputedAction(var manager: ActionManager, this.setEffectiveAmount(significantAmount - committedAmount) } + private fun getStreetSignificantActionBefore(index: Int): ComputedAction? { + return this.manager.getStreetLastSignificantAction(this.street, index - 1) + } + private fun getStreetLastSignificantAction(): ComputedAction? { return this.manager.getStreetLastSignificantAction(this.street, this.action.index - 1) }