refactoring

Author: yohm

axelrod/strategies/grudger.py

@@ -394,28 +394,24 @@ def strategy(self, opponent: Player) -> Action:
             return C
         if hist == [(D, C), (C, D), (C, C)]:
             return C
-        if hist == [(C, D), (C, C), (C, C)]:
+        if hist == [(C, D), (C, C), (C, C)]:  # Rule: A & R2
             return C
         if hist == [(C, C), (C, C), (C, D)]:  # Rule: P
             return D
         if hist == [(C, C), (C, D), (D, C)]:
             return C
         if hist == [(C, D), (D, C), (C, C)]:
             return C
-        if hist == [(D, C), (C, C), (C, C)]:
+        if hist == [(D, C), (C, C), (C, C)]:  # Rule: P & R1
             return C
         if hist == [(D, D), (D, D), (D, C)]:  # Rule: R1
             return C
         if hist == [(D, D), (D, C), (C, C)]:
             return C
-        # if hist == [(D, C), (C, C), (C, C)]:  # duplicate of Rule P
-        #     return(C
         if hist == [(D, D), (D, D), (C, D)]:  # Rule: R2
             return C
         if hist == [(D, D), (C, D), (C, C)]:
             return C
-        # if hist == [(C, D), (C, C), (C, C)]:  # duplicate of Rule A
-        #     return(C
         if hist == [(D, D), (D, D), (C, C)]:  # Rule: R3
             return C
         if hist == [(D, D), (C, C), (C, C)]:

axelrod/tests/strategies/test_grudger.py

@@ -352,13 +352,6 @@ class TestCapri(TestPlayer):
         "manipulates_state": False,
     }
 
-    def assert_prescription(self, player_history, opponent_history, prescription):
-        player = self.player()
-        player._history = player_history
-        opponent = axl.MockPlayer()
-        opponent._history = opponent_history
-        self.assertEqual(player.strategy(opponent=opponent), prescription)
-
     def test_strategy(self):
         # cooperate at mutual cooperation
         opponent = axl.Cooperator()