From 7eb7378ed3c631670967dca520ec88e4cb413af7 Mon Sep 17 00:00:00 2001 From: LSaldyt Date: Fri, 8 Dec 2017 10:49:58 -0700 Subject: [PATCH] Removes alpha/beta from weighted formula --- papers/formulas/weighted.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/papers/formulas/weighted.py b/papers/formulas/weighted.py index 74aefd2..77007f9 100644 --- a/papers/formulas/weighted.py +++ b/papers/formulas/weighted.py @@ -1,5 +1,5 @@ -def _weighted(temp, prob, s, u, alpha=1, beta=1): - weighted = (temp / 100) * s + ((100 - temp) / 100) * u +def _weighted(temp, prob, s, u): + weighted = (temp / 100) * s + ((100 - temp) / 100) * u return weighted def _weighted_inverse(temp, prob): @@ -7,7 +7,7 @@ def _weighted_inverse(temp, prob): return _weighted(temp, prob, iprob, prob) # Uses .5 instead of 1-prob -def _fifty_converge(temp, prob): +def _fifty_converge(temp, prob): return _weighted(temp, prob, .5, prob) # Curves to the average of the (1-p) and .5 @@ -15,14 +15,14 @@ def _soft_curve(temp, prob): return min(1, _weighted(temp, prob, (1.5-prob)/2, prob)) # Curves to the weighted average of the (1-p) and .5 -def _weighted_soft_curve(temp, prob): +def _weighted_soft_curve(temp, prob): weight = 100 gamma = .5 # convergance value alpha = 1 # gamma weight beta = 3 # iprob weight - curved = min(1, - (temp / weight) * - ((alpha * gamma + beta * (1 - prob)) / - (alpha + beta)) + + curved = min(1, + (temp / weight) * + ((alpha * gamma + beta * (1 - prob)) / + (alpha + beta)) + ((weight - temp) / weight) * prob) return curved