Fix reclassifier for joss ann.

Axelrod-Python · Apr 14, 2017 · 149e2e6 · 149e2e6
1 parent 170c209
commit 149e2e6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/axelrod/strategy_transformers.py b/axelrod/strategy_transformers.py
@@ -478,9 +478,9 @@ def jossann_reclassifier(original_classifier, probability):
     if sum(probability) > 1:
         probability = tuple([i / sum(probability) for i in probability])
 
-    if probability[0] in [0, 1]:
+    if probability in [(1, 0), (0, 1)]:
         original_classifier["stochastic"] = False
-    else:
+    elif sum(probability) != 0:
         original_classifier["stochastic"] = True
 
     return original_classifier

diff --git a/axelrod/tests/unit/test_strategy_transformers.py b/axelrod/tests/unit/test_strategy_transformers.py
@@ -183,6 +183,22 @@ def test_jossann_transformer(self):
         self.assertTrue(p1.classifier["stochastic"])
         self.assertTrue(p1().classifier["stochastic"])
 
+        probability = (0, .5)
+        p1 = JossAnnTransformer(probability)(axelrod.TitForTat)
+        self.assertTrue(p1.classifier["stochastic"])
+        self.assertTrue(p1().classifier["stochastic"])
+
+        probability = (0, 0)
+        p1 = JossAnnTransformer(probability)(axelrod.TitForTat)
+        self.assertFalse(p1.classifier["stochastic"])
+        self.assertFalse(p1().classifier["stochastic"])
+
+        probability = (0, 0)
+        p1 = JossAnnTransformer(probability)(axelrod.Random)
+        self.assertTrue(p1.classifier["stochastic"])
+        self.assertTrue(p1().classifier["stochastic"])
+
+
     def test_noisy_transformer(self):
         """Tests that the noisy transformed does flip some moves."""
         random.seed(5)