removed changes for cases that will not occur

Author: eric-s-s

axelrod/strategies/grudger.py

@@ -284,7 +284,7 @@ def __init__(self, n: int=1, d: int=4, c: int=2) -> None:
         self.n = n
         self.d = d
         self.c = c
-        self.grudge = [D] * d + [C] * c
+        self.grudge = [D] * (d - 1) + [C] * c
         self.grudged = False
         self.grudge_memory = 0
 
@@ -294,17 +294,16 @@ def strategy(self, opponent: Player) -> Action:
         The punishment is in the form of 'd' defections followed by a penance of
         'c' consecutive cooperations.
         """
-        if self.grudge_memory == len(self.grudge):
-            self.grudged = False
-            self.grudge_memory = 0
-
-        if [D] * self.n == opponent.history[-self.n:] or self.n == 0:
-            self.grudged = True
-
         if self.grudged:
             strategy = self.grudge[self.grudge_memory]
             self.grudge_memory += 1
+            if self.grudge_memory == len(self.grudge):
+                self.grudged = False
+                self.grudge_memory = 0
             return strategy
+        elif [D] * self.n == opponent.history[-self.n:]:
+            self.grudged = True
+            return D
 
         return C
 

axelrod/tests/strategies/test_grudger.py

@@ -283,59 +283,3 @@ def test_strategy(self):
         self.versus_test(axl.MockPlayer(actions=[D, D, C, C]),
                          expected_actions=actions,
                          init_kwargs={"n": 1, "d": 1, "c": 1})
-
-    def test_edge_case_n_is_zero(self):
-        # Always uses grudge response.
-        init_kwargs = {'n': 0}
-        grudge_response_d = [(D, D)] * 4 + [(C, D)] * 2
-        grudge_response_c = [(D, C)] * 4 + [(C, C)] * 2
-
-        opponent = axl.Defector()
-        actions = grudge_response_d * 5
-        self.versus_test(opponent, expected_actions=actions,
-                         init_kwargs=init_kwargs)
-
-        opponent = axl.Cooperator()
-        actions = grudge_response_c * 5
-        self.versus_test(opponent, expected_actions=actions,
-                         init_kwargs=init_kwargs)
-
-    def test_edge_case_d_is_zero(self):
-        # Grudge response is only C, so acts like Cooperator.
-        init_kwargs = {'d': 0}
-
-        opponent = axl.Defector()
-        actions = [(C, D)] * 5
-        self.versus_test(opponent, expected_actions=actions,
-                         init_kwargs=init_kwargs)
-
-        opponent = axl.Alternator()
-        actions = [(C, C), (C, D)] * 5
-        self.versus_test(opponent, expected_actions=actions,
-                         init_kwargs=init_kwargs)
-
-    def test_edge_case_c_is_zero(self):
-        # Grudge response is a set number of D's (defaults to 4)
-        init_kwargs = {'c': 0}
-
-        opponent = axl.Defector()
-        actions = [(C, D)] + [(D, D)] * 10
-        self.versus_test(opponent, expected_actions=actions,
-                         init_kwargs=init_kwargs)
-
-        opponent_actions = [C] * 10 + [D]
-        opponent = axl.MockPlayer(actions=opponent_actions)
-        actions_start = [(C, C)] * 10 + [(C, D)]
-        subsequent = [(D, C)] * 4 + [(C, C)] * 6 + [(C, D)]
-        actions = actions_start + subsequent * 5
-        self.versus_test(opponent, expected_actions=actions,
-                         init_kwargs=init_kwargs)
-
-    def test_repr(self):
-        default_player = self.player()
-        self.assertEqual(repr(default_player),
-                         "General Soft Grudger: n=1,d=4,c=2")
-
-        set_params_player = self.player(n=2, d=3, c=4)
-        self.assertEqual(repr(set_params_player),
-                         "General Soft Grudger: n=2,d=3,c=4")