Incorporate comments

Set memory_depth to float('inf').
Remove redundant history length check.
Remove redundant else statements.
Remove Prober4.cooperation_pool and replace with history length check.
Test Prober4.turned_defector value.
Revert the update of strategies counter in doc tests.

Author: margaret

axelrod/strategies/prober.py

@@ -118,7 +118,7 @@ class Prober4(Player):
     name = 'Prober 4'
     classifier = {
         'stochastic': False,
-        'memory_depth': 1,
+        'memory_depth': float('inf'),
         'makes_use_of': set(),
         'long_run_time': False,
         'inspects_source': False,
@@ -134,39 +134,33 @@ def __init__(self):
         ]
         self.just_Ds = 0
         self.unjust_Ds = 0
-        self.cooperation_pool = [C] * 5
         self.turned_defector = False
 
     def strategy(self, opponent):
-        if len(opponent.history) == 0:
-            return self.init_sequence[0]
         if len(self.history) == 0:
             return self.init_sequence[0]
-        else:
-            turn = len(self.history)
-            if turn < len(self.init_sequence):
-                if opponent.history[-1] == D:
-                    if self.history[-1] == D:
-                        self.just_Ds += 1
-                    if self.history[-1] == C:
-                        self.unjust_Ds += 1
-                return self.init_sequence[turn]
-            if turn == len(self.init_sequence):
-                diff_in_Ds = abs(self.just_Ds - self.unjust_Ds)
-                self.turned_defector = (diff_in_Ds <= 2)
-            if self.turned_defector:
-                return D
-            if not self.turned_defector:
-                if self.cooperation_pool:
-                    return self.cooperation_pool.pop()
-                else:
-                    return D if opponent.history[-1] == D else C
+        turn = len(self.history)
+        if turn < len(self.init_sequence):
+            if opponent.history[-1] == D:
+                if self.history[-1] == D:
+                    self.just_Ds += 1
+                if self.history[-1] == C:
+                    self.unjust_Ds += 1
+            return self.init_sequence[turn]
+        if turn == len(self.init_sequence):
+            diff_in_Ds = abs(self.just_Ds - self.unjust_Ds)
+            self.turned_defector = (diff_in_Ds <= 2)
+        if self.turned_defector:
+            return D
+        if not self.turned_defector:
+            if turn < len(self.init_sequence) + 5:
+                return C
+            return D if opponent.history[-1] == D else C
 
     def reset(self):
         Player.reset(self)
         self.just_Ds = 0
         self.unjust_Ds = 0
-        self.cooperation_pool = [C] * 5
         self.turned_defector = False
 
 

axelrod/tests/unit/test_prober.py

@@ -105,7 +105,7 @@ class TestProber4(TestPlayer):
     player = axelrod.Prober4
     expected_classifier = {
         'stochastic': False,
-        'memory_depth': 1,
+        'memory_depth': float('inf'),
         'makes_use_of': set(),
         'long_run_time': False,
         'inspects_source': False,
@@ -115,7 +115,6 @@ class TestProber4(TestPlayer):
     initial_sequence = [
         C, C, D, C, D, D, D, C, C, D, C, D, C, C, D, C, D, D, C, D
     ]
-    cooperation_pool = [C] * 5
 
     def test_initial_strategy(self):
         """Starts by playing CCDCDDDCCDCDCCDCDDCD."""
@@ -137,8 +136,9 @@ def test_strategy(self):
 
         history1 = self.initial_sequence
         responses = [D] * 10
+        attrs = {'turned_defector': True}
         for history2 in provocative_histories:
-            self.responses_test(history1, history2, responses)
+            self.responses_test(history1, history2, responses, attrs=attrs)
 
         # Otherwise cooperates for 5 rounds
         unprovocative_histories = [
@@ -149,27 +149,27 @@ def test_strategy(self):
             [C, C, C, C, D, D, C, C, D, C, C, D, D, C, D, C, D, C, C, C],
         ]
 
-        history1 = self.initial_sequence
-        responses = self.cooperation_pool
+        responses = [C] * 5
+        attrs = {'turned_defector': False}
         for history2 in unprovocative_histories:
-            self.responses_test(history1, history2, responses)
+            self.responses_test(history1, history2, responses, attrs=attrs)
 
         # and plays like TFT afterwards
-            history1 += self.cooperation_pool
-            history2 += self.cooperation_pool
-            self.responses_test(history1, history2, [C])
+            history1 += responses
+            history2 += responses
+            self.responses_test(history1, history2, [C], attrs=attrs)
 
             history1 += [C]
             history2 += [D]
-            self.responses_test(history1, history2, [D])
+            self.responses_test(history1, history2, [D], attrs=attrs)
 
             history1 += [D]
             history2 += [C]
-            self.responses_test(history1, history2, [C])
+            self.responses_test(history1, history2, [C], attrs=attrs)
 
             history1 += [C]
             history2 += [D]
-            self.responses_test(history1, history2, [D])
+            self.responses_test(history1, history2, [D], attrs=attrs)
 
 
 class TestHardProber(TestPlayer):

docs/tutorials/advanced/classification_of_strategies.rst

@@ -58,7 +58,7 @@ make a decision::
     ... }
     >>> strategies = axl.filtered_strategies(filterset)
     >>> len(strategies)
-    25
+    24
 
 Multiple filters can be specified within the filterset dictionary. To specify a
 range of memory_depth values, we can use the 'min_memory_depth' and
@@ -70,7 +70,7 @@ range of memory_depth values, we can use the 'min_memory_depth' and
     ... }
     >>> strategies = axl.filtered_strategies(filterset)
     >>> len(strategies)
-    42
+    41
 
 We can also identify strategies that make use of particular properties of the
 tournament. For example, here is the number of strategies that  make use of the