From 176e6cd4e2a31ca6b06961f61a7e74c4ccfefaaa Mon Sep 17 00:00:00 2001
From: LSaldyt <lucassaldyt@gmail.com>
Date: Mon, 16 Oct 2017 18:18:55 -0700
Subject: [PATCH 1/2] Adds final formula comparison code

---
 copycat/copycat.py     | 44 ++++++++++++++++++++----------------------
 copycat/temperature.py |  2 +-
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/copycat/copycat.py b/copycat/copycat.py
index e66a738..e80a2c6 100644
--- a/copycat/copycat.py
+++ b/copycat/copycat.py
@@ -4,6 +4,8 @@ from .slipnet import Slipnet
 from .temperature import Temperature
 from .workspace import Workspace
 
+from pprint import pprint
+
 class Reporter(object):
     """Do-nothing base class for defining new reporter types"""
     def report_answer(self, answer):
@@ -68,31 +70,27 @@ class Copycat(object):
     def run(self, initial, modified, target, iterations):
         self.workspace.resetWithStrings(initial, modified, target)
 
-        #self.temperature.useAdj('original')
-        #self.temperature.useAdj('entropy')
-        #self.temperature.useAdj('inverse') # 100 weight
-        #self.temperature.useAdj('fifty_converge') 
-        #self.temperature.useAdj('soft') 
-        #self.temperature.useAdj('weighted_soft') 
-        #self.temperature.useAdj('alt_fifty')
-        #self.temperature.useAdj('average_alt')
-        self.temperature.useAdj('best')
-
         answers = {}
-        for i in range(iterations):
-            answer = self.runTrial()
-            d = answers.setdefault(answer['answer'], {
-                'count': 0,
-                'sumtemp': 0, # TODO: use entropy
-                'sumtime': 0
-            })
-            d['count'] += 1
-            d['sumtemp'] += answer['temp'] # TODO: use entropy
-            d['sumtime'] += answer['time']
+        for formula in ['original', 'best']:
+            self.temperature.useAdj(formula)
+            answers = {}
+            for i in range(iterations):
+                answer = self.runTrial()
+                d = answers.setdefault(answer['answer'], {
+                    'count': 0,
+                    'sumtemp': 0, # TODO: use entropy
+                    'sumtime': 0
+                })
+                d['count'] += 1
+                d['sumtemp'] += answer['temp'] # TODO: use entropy
+                d['sumtime'] += answer['time']
+
+            for answer, d in answers.items():
+                d['avgtemp'] = d.pop('sumtemp') / d['count']
+                d['avgtime'] = d.pop('sumtime') / d['count']
+            print('The formula {} provided:'.format(formula))
+            pprint(answers)
 
-        for answer, d in answers.items():
-            d['avgtemp'] = d.pop('sumtemp') / d['count']
-            d['avgtime'] = d.pop('sumtime') / d['count']
         return answers
 
     def run_forever(self, initial, modified, target):
diff --git a/copycat/temperature.py b/copycat/temperature.py
index e62f0a8..17f586e 100644
--- a/copycat/temperature.py
+++ b/copycat/temperature.py
@@ -58,7 +58,7 @@ def _averaged_alt(temp, prob):
 
 def _working_best(temp, prob):
     s = .5   # convergence
-    r = 1.05 # power
+    r = 2 # power
     u = prob ** r if prob < .5 else prob ** (1/r)
     return _weighted(temp, prob, s, u)
 

From 9a5aca5b808bab0a137663724c43007fbebd8a3e Mon Sep 17 00:00:00 2001
From: LSaldyt <lucassaldyt@gmail.com>
Date: Wed, 1 Nov 2017 10:58:53 -0700
Subject: [PATCH 2/2] Adds parameterized and soft "best" formula alts

---
 copycat/copycat.py     |  2 +-
 copycat/temperature.py | 25 +++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/copycat/copycat.py b/copycat/copycat.py
index e80a2c6..f863ad9 100644
--- a/copycat/copycat.py
+++ b/copycat/copycat.py
@@ -71,7 +71,7 @@ class Copycat(object):
         self.workspace.resetWithStrings(initial, modified, target)
 
         answers = {}
-        for formula in ['original', 'best']:
+        for formula in ['original', 'best', 'sbest', 'pbest']:
             self.temperature.useAdj(formula)
             answers = {}
             for i in range(iterations):
diff --git a/copycat/temperature.py b/copycat/temperature.py
index 17f586e..2e3781c 100644
--- a/copycat/temperature.py
+++ b/copycat/temperature.py
@@ -24,7 +24,7 @@ def _entropy(temp, prob):
     f = (c + 1) * prob
     return -f * math.log2(f)
 
-def _weighted(temp, prob, s, u):
+def _weighted(temp, prob, s, u, alpha=1, beta=1):
     weighted = (temp / 100) * s + ((100 - temp) / 100) * u 
     return weighted
 
@@ -56,12 +56,31 @@ def _averaged_alt(temp, prob):
     u = prob ** 2 if prob < .5 else math.sqrt(prob)
     return _weighted(temp, prob, s, u)
 
+
 def _working_best(temp, prob):
     s = .5   # convergence
     r = 2 # power
     u = prob ** r if prob < .5 else prob ** (1/r)
     return _weighted(temp, prob, s, u)
 
+def _soft_best(temp, prob):
+    s = .5   # convergence
+    r = 1.05 # power
+    u = prob ** r if prob < .5 else prob ** (1/r)
+    return _weighted(temp, prob, s, u)
+
+def _parameterized_best(temp, prob):
+    # (D$66/100)*($E$64*$B68 + $G$64*$F$64)/($E$64 + $G$64)+((100-D$66)/100)*IF($B68 > 0.5, $B68^(1/$H$64), $B68^$H$64)
+    # (T/100) * (alpha * p + beta * .5) / (alpha + beta) + ((100 - T)/100) * IF(p > .5, p^(1/2), p^2)
+    alpha = 5
+    beta  = 1
+    s     = .5
+    s     = (alpha * prob + beta * s) / (alpha + beta)
+    r     = 1.05
+    u = prob ** r if prob < .5 else prob ** (1/r)
+    return _weighted(temp, prob, s, u)
+
+
 class Temperature(object):
     def __init__(self):
         self.reset()
@@ -75,7 +94,9 @@ class Temperature(object):
                 'weighted_soft'  : _weighted_soft_curve,
                 'alt_fifty'      : _alt_fifty,
                 'average_alt'    : _averaged_alt,
-                'best'           : _working_best}
+                'best'           : _working_best,
+                'sbest'          : _soft_best,
+                'pbest'          : _parameterized_best}
 
     def reset(self):
         self.actual_value = 100.0