First first by Grofman.

Author: drvinceknight

axelrod/strategies/_strategies.py

@@ -9,7 +9,7 @@
     FirstByDavis,
     FirstByFeld,
     FirstByGraaskamp,
-    Grofman,
+    FirstByGrofman,
     Joss,
     Nydegger,
     RevisedDowning,
@@ -329,7 +329,7 @@
     SecondByGraaskampKatzen,
     Gradual,
     GradualKiller,
-    Grofman,
+    FirstByGrofman,
     Grudger,
     GrudgerAlternator,
     Grumpy,

axelrod/strategies/axelrod_first.py

@@ -349,16 +349,14 @@ def strategy(self, opponent: Player) -> Action:
         return C
 
 
-# TODO Need to check this one, a MoreGrofman existed in
-# axelrod_second
-class Grofman(Player):
+class FirstByGrofman(Player):
     """
-    Submitted to Axelrod's first tournament by Bernard Grofman.
+    Submitted to Axelrod's first tournament by Bernard Grofman..
+
+    The description written in [Axelrod1980]_ is:
 
-    Cooperate on the first two rounds and
-    returns the opponent's last action for the next 5. For the rest of the game
-    Grofman cooperates if both players selected the same action in the previous
-    round, and otherwise cooperates randomly with probability 2/7.
+     > "If the players did different things on the previous move, this rule
+     > cooperates with probability 2/7. Otherwise this rule always cooperates."
 
     This strategy came 4th in Axelrod's original tournament.
 
@@ -367,24 +365,18 @@ class Grofman(Player):
     - Grofman: [Axelrod1980]_
     """
 
-    name = "Grofman"
+    name = "First tournament by Grofman"
     classifier = {
-        "memory_depth": float("inf"),
+        "memory_depth": 1,
         "stochastic": True,
         "makes_use_of": set(),
         "long_run_time": False,
         "inspects_source": False,
         "manipulates_source": False,
         "manipulates_state": False,
     }
-
     def strategy(self, opponent: Player) -> Action:
-        round_number = len(self.history) + 1
-        if round_number < 3:
-            return C
-        if round_number < 8:
-            return opponent.history[-1]
-        if self.history[-1] == opponent.history[-1]:
+        if len(self.history) == 0 or self.history[-1] == opponent.history[-1]:
             return C
         return random_choice(2 / 7)
 

axelrod/tests/strategies/test_axelrod_first.py

@@ -242,12 +242,12 @@ def test_strategy(self):
         )
 
 
-class TestGrofman(TestPlayer):
+class TestFirstByGrofman(TestPlayer):
 
-    name = "Grofman"
-    player = axelrod.Grofman
+    name = "First tournament by Grofman"
+    player = axelrod.FirstByGrofman
     expected_classifier = {
-        "memory_depth": float("inf"),
+        "memory_depth": 1,
         "stochastic": True,
         "makes_use_of": set(),
         "long_run_time": False,
@@ -264,11 +264,11 @@ def test_strategy(self):
         self.versus_test(axelrod.Alternator(), expected_actions=actions)
 
         opponent = axelrod.MockPlayer(actions=[D] * 8)
-        actions = [(C, D)] * 2 + [(D, D)] * 5 + [(C, D)] + [(C, D)]
+        actions = [(C, D), (C, D), (D, D), (C, D), (D, D), (C, D), (C, D), (D, D)]
         self.versus_test(opponent, expected_actions=actions, seed=1)
 
         opponent = axelrod.MockPlayer(actions=[D] * 8)
-        actions = [(C, D)] * 2 + [(D, D)] * 5 + [(C, D)] + [(D, D)]
+        actions = [(C, D), (D, D), (C, D), (D, D), (C, D), (C, D), (C, D), (D, D)]
         self.versus_test(opponent, expected_actions=actions, seed=2)
 
 

docs/reference/overview_of_strategies.rst

@@ -19,7 +19,7 @@ An indication is given as to whether or not this strategy is implemented in the
   "Tit For Tat", "Anatol Rapoport", ":class:`TitForTat <axelrod.strategies.titfortat.TitForTat>`"
   "Tideman and Chieruzzi", "T Nicolaus Tideman and Paula Chieruzz", ":class:`TidemanAndChieruzzi <axelrod.strategies.axelrod_first.TidemanAndChieruzzi>`"
   "Nydegger", "Rudy Nydegger", ":class:`Nydegger <axelrod.strategies.axelrod_first.Nydegger>`"
-  "Grofman", "Bernard Grofman", ":class:`Grofman <axelrod.strategies.axelrod_first.Grofman>`"
+  "Grofman", "Bernard Grofman", ":class:`Grofman <axelrod.strategies.axelrod_first.FirstByGrofman>`"
   "Shubik", "Martin Shubik", ":class:`Shubik <axelrod.strategies.axelrod_first.Shubik>`"
   "Stein and Rapoport", "Stein and Anatol Rapoport", ":class:`SteinAndRapoport <axelrod.strategies.axelrod_first.SteinAndRapoport>`"
   "Grudger", "James W Friedman", ":class:`Grudger <axelrod.strategies.grudger.Grudger>`"