Rename Stein and Rapoport.

Author: drvinceknight

axelrod/strategies/_strategies.py

@@ -14,7 +14,7 @@
     FirstByNydegger,
     RevisedDowning,
     FirstByShubik,
-    SteinAndRapoport,
+    FirstBySteinAndRapoport,
     TidemanAndChieruzzi,
     FirstByTullock,
     FirstByAnonymous,
@@ -413,7 +413,7 @@
     SolutionB5,
     SpitefulTitForTat,
     Stalker,
-    SteinAndRapoport,
+    FirstBySteinAndRapoport,
     StochasticCooperator,
     StochasticWSLS,
     SuspiciousTitForTat,

axelrod/strategies/axelrod_first.py

@@ -692,14 +692,25 @@ def strategy(opponent: Player) -> Action:
 
 
 @FinalTransformer((D, D), name_prefix=None)
-class SteinAndRapoport(Player):
-    """This strategy plays a modification of Tit For Tat.
+class FirstBySteinAndRapoport(Player):
+    """
+    Submitted to Axelrod's first tournament by William Stein and Amnon Rapoport.
+
+    The description written in [Axelrod1980]_ is:
+
+    > "This rule plays tit for tat except that it cooperates on the first four
+    > moves, it defects on the last two moves, and every fifteen moves it checks
+    > to see if the opponent seems to be playing randomly. This check uses a
+    > chi-squared test of the other's transition probabilities and also checks for
+    > alternating moves of CD and DC.
+
+    This is implemented as follows:
 
     1. It cooperates for the first 4 moves.
     2. It defects on the last 2 moves.
     3. Every 15 moves it makes use of a `chi-squared
        test <http://en.wikipedia.org/wiki/Chi-squared_test>`_ to check if the
-       opponent is playing randomly.
+       opponent is playing randomly. If so it defects.
 
     This strategy came 6th in Axelrod's original tournament.
 
@@ -708,7 +719,7 @@ class SteinAndRapoport(Player):
     - SteinAndRapoport: [Axelrod1980]_
     """
 
-    name = "Stein and Rapoport"
+    name = "First tournament by Stein and Rapoport"
     classifier = {
         "memory_depth": float("inf"),
         "stochastic": False,

axelrod/tests/strategies/test_axelrod_first.py

@@ -470,10 +470,10 @@ def test_strategy(self):
         self.versus_test(axelrod.Cooperator(), expected_actions=actions, seed=10)
 
 
-class TestSteinAndRapoport(TestPlayer):
+class TestFirstBySteinAndRapoport(TestPlayer):
 
-    name = "Stein and Rapoport: 0.05: (D, D)"
-    player = axelrod.SteinAndRapoport
+    name = "First tournament by Stein and Rapoport: 0.05: (D, D)"
+    player = axelrod.FirstBySteinAndRapoport
     expected_classifier = {
         "memory_depth": float("inf"),
         "long_run_time": False,

docs/reference/overview_of_strategies.rst

@@ -21,7 +21,7 @@ An indication is given as to whether or not this strategy is implemented in the
   "Nydegger", "Rudy Nydegger", ":class:`Nydegger <axelrod.strategies.axelrod_first.FirstByNydegger>`"
   "Grofman", "Bernard Grofman", ":class:`Grofman <axelrod.strategies.axelrod_first.FirstByGrofman>`"
   "Shubik", "Martin Shubik", ":class:`Shubik <axelrod.strategies.axelrod_first.FirstByShubik>`"
-  "Stein and Rapoport", "Stein and Anatol Rapoport", ":class:`SteinAndRapoport <axelrod.strategies.axelrod_first.SteinAndRapoport>`"
+  "Stein and Rapoport", "Stein and Anatol Rapoport", ":class:`SteinAndRapoport <axelrod.strategies.axelrod_first.FirstBySteinAndRapoport>`"
   "Grudger", "James W Friedman", ":class:`Grudger <axelrod.strategies.grudger.Grudger>`"
   "Davis", "Morton Davis", ":class:`Davis <axelrod.strategies.axelrod_first.FirstByDavis>`"
   "Graaskamp", "Jim Graaskamp", ":class:`Graaskamp <axelrod.strategies.axelrod_first.FirstByGraaskamp>`"