Modify docstring and name of Joss.

Author: drvinceknight

axelrod/strategies/_strategies.py

@@ -10,7 +10,7 @@
     FirstByFeld,
     FirstByGraaskamp,
     FirstByGrofman,
-    Joss,
+    FirstByJoss,
     Nydegger,
     RevisedDowning,
     Shubik,
@@ -347,7 +347,7 @@
     Hopeless,
     Inverse,
     InversePunisher,
-    Joss,
+    FirstByJoss,
     SecondByKluepfel,
     KnowledgeableWorseAndWorse,
     LevelPunisher,

axelrod/strategies/axelrod_first.py

@@ -351,7 +351,7 @@ def strategy(self, opponent: Player) -> Action:
 
 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:
 
@@ -381,12 +381,14 @@ def strategy(self, opponent: Player) -> Action:
         return random_choice(2 / 7)
 
 
-class Joss(MemoryOnePlayer):
+class FirstByJoss(MemoryOnePlayer):
     """
     Submitted to Axelrod's first tournament by Johann Joss.
 
-    Cooperates with probability 0.9 when the opponent cooperates, otherwise
-    emulates Tit-For-Tat.
+    The description written in [Axelrod1980]_ is:
+
+    > "This rule cooperates 90% of the time after a cooperation by the other. It
+    > always defects after a defection by the other."
 
     This strategy came 12th in Axelrod's original tournament.
 
@@ -396,7 +398,7 @@ class Joss(MemoryOnePlayer):
     - Hard Joss: [Stewart2012]_
     """
 
-    name = "Joss"
+    name = "First tournament by Joss"
 
     def __init__(self, p: float = 0.9) -> None:
         """

axelrod/strategies/calculator.py

@@ -2,14 +2,14 @@
 from axelrod.action import Action
 from axelrod.player import Player
 
-from .axelrod_first import Joss
+from .axelrod_first import FirstByJoss
 
 C, D = Action.C, Action.D
 
 
 class Calculator(Player):
     """
-    Plays like (Hard) Joss for the first 20 rounds. If periodic behavior is
+    Plays like (Hard) FirstByJoss for the first 20 rounds. If periodic behavior is
     detected, defect forever. Otherwise play TFT.
 
 
@@ -31,7 +31,7 @@ class Calculator(Player):
 
     def __init__(self) -> None:
         super().__init__()
-        self.joss_instance = Joss()
+        self.joss_instance = FirstByJoss()
 
     def strategy(self, opponent: Player) -> Action:
         turn = len(self.history)

axelrod/tests/strategies/test_axelrod_first.py

@@ -272,10 +272,10 @@ def test_strategy(self):
         self.versus_test(opponent, expected_actions=actions, seed=2)
 
 
-class TestJoss(TestPlayer):
+class TestFirstByJoss(TestPlayer):
 
-    name = "Joss: 0.9"
-    player = axelrod.Joss
+    name = "First tournament by Joss: 0.9"
+    player = axelrod.FirstByJoss
     expected_classifier = {
         "memory_depth": 1,
         "stochastic": True,

docs/reference/overview_of_strategies.rst

@@ -27,7 +27,7 @@ An indication is given as to whether or not this strategy is implemented in the
   "Graaskamp", "Jim Graaskamp", ":class:`Graaskamp <axelrod.strategies.axelrod_first.FirstByGraaskamp>`"
   "Downing", "Leslie Downing", ":class:`RevisedDowning <axelrod.strategies.axelrod_first.RevisedDowning>`"
   "Feld", "Scott Feld", ":class:`Feld <axelrod.strategies.axelrod_first.FirstByFeld>`"
-  "Joss", "Johann Joss", ":class:`Joss <axelrod.strategies.axelrod_first.Joss>`"
+  "Joss", "Johann Joss", ":class:`Joss <axelrod.strategies.axelrod_first.FirstByJoss>`"
   "Tullock",  "Gordon Tullock", ":class:`Tullock <axelrod.strategies.axelrod_first.Tullock>`"
   "Unnamed Strategy", "Unknown", ":class:`UnnamedStrategy <axelrod.strategies.axelrod_first.UnnamedStrategy>`"
   "Random", "Unknownd", ":class:`Random <axelrod.strategies.rand.Random>`"