Rename Shubik but make notes for further investigation.

Author: drvinceknight

axelrod/strategies/_strategies.py

@@ -13,7 +13,7 @@
     FirstByJoss,
     FirstByNydegger,
     RevisedDowning,
-    Shubik,
+    FirstByShubik,
     SteinAndRapoport,
     TidemanAndChieruzzi,
     Tullock,
@@ -403,7 +403,7 @@
     SecondByRowsam,
     SelfSteem,
     ShortMem,
-    Shubik,
+    FirstByShubik,
     SlowTitForTwoTats2,
     SneakyTitForTat,
     SoftGrudger,

axelrod/strategies/axelrod_first.py

@@ -514,21 +514,37 @@ def strategy(self, opponent: Player) -> Action:
         return C
 
 
-class Shubik(Player):
+class FirstByShubik(Player):
     """
     Submitted to Axelrod's first tournament by Martin Shubik.
 
+    The description written in [Axelrod1980]_ is:
+
+    > "This rule cooperates until the other defects, and then defects once. If
+    > the other defects again after the rule's cooperation is resumed, the rule
+    > defects twice. In general, the length of retaliation is increased by one for
+    > each departure from mutual cooperation. This rule is described with its
+    > strategic implications in Shubik (1970). Further treatment of its is given
+    > in Taylor (1976).
+
+    This is interpreted as:
+
     Plays like Tit-For-Tat with the following modification. After each
     retaliation, the number of rounds that Shubik retaliates increases by 1.
 
+    # TODO Read
+    # https://www.jstor.org/stable/pdf/173263.pdf?refreqid=excelsior%3A94cf485d88f107de1d72296c4cf5d988
+    # as supposedely there there is description indicating that the strategy
+    # would cooperate twice. I do not think I agree but need to check carefully.
+
     This strategy came 5th in Axelrod's original tournament.
 
     Names:
 
     - Shubik: [Axelrod1980]_
     """
 
-    name = "Shubik"
+    name = "First tournament by Shubik"
     classifier = {
         "memory_depth": float("inf"),
         "stochastic": False,

axelrod/tests/strategies/test_axelrod_first.py

@@ -355,10 +355,10 @@ def test_strategy(self):
         self.versus_test(opponent, expected_actions=actions)
 
 
-class TestShubik(TestPlayer):
+class TestFirstByShubik(TestPlayer):
 
-    name = "Shubik"
-    player = axelrod.Shubik
+    name = "First tournament by Shubik"
+    player = axelrod.FirstByShubik
     expected_classifier = {
         "memory_depth": float("inf"),
         "stochastic": False,

docs/reference/overview_of_strategies.rst

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