Merge pull request #1144 from gaffney2010/master

 Implemented GraaskampKatzen strategy from Axelrod's Second (k60r)

Author: meatballs

axelrod/strategies/_strategies.py

@@ -9,7 +9,7 @@
     UnnamedStrategy, SteinAndRapoport, TidemanAndChieruzzi)
 from .axelrod_second import (
     Champion, Eatherley, Tester, Gladstein, Tranquilizer, MoreGrofman,
-    Kluepfel, Borufsen, Cave, WmAdams)
+    Kluepfel, Borufsen, Cave, WmAdams, GraaskampKatzen)
 from .backstabber import BackStabber, DoubleCrosser
 from .better_and_better import BetterAndBetter
 from .bush_mosteller import BushMosteller
@@ -170,6 +170,7 @@
     GoByMajority40,
     GoByMajority5,
     Golden,
+    GraaskampKatzen,
     Gradual,
     GradualKiller,
     Grofman,

axelrod/strategies/axelrod_second.py

@@ -203,6 +203,7 @@ def strategy(self, opponent: Player) -> Action:
             # Play TFT
             return opponent.history[-1]
 
+
 class Tranquilizer(Player):
 
     """
@@ -468,6 +469,7 @@ def strategy(self, opponent: Player) -> Action:
                 return C
             return D
 
+
 class Kluepfel(Player):
     """
     Strategy submitted to Axelrod's second tournament by Charles Kluepfel
@@ -549,7 +551,7 @@ def strategy(self, opponent: Player) -> Action:
 
         if one_move_ago == two_moves_ago and two_moves_ago == three_moves_ago:
             return one_move_ago
-        
+
         r = random.random() # Everything following is stochastic
         if one_move_ago == two_moves_ago:
             if r < 0.9:
@@ -567,6 +569,7 @@ def strategy(self, opponent: Player) -> Action:
             else:
                 return one_move_ago.flip()
 
+
 class Borufsen(Player):
     """
     Strategy submitted to Axelrod's second tournament by Otto Borufsen
@@ -588,8 +591,8 @@ class Borufsen(Player):
        cooperate.  (Doesn't block third rule.)
     3. Otherwise, do tit-for-tat.
 
-    Start in normal mode, but every 25 turns starting with the 27th turn, 
-    re-evaluate the mode.  Enter defect mode if any of the following 
+    Start in normal mode, but every 25 turns starting with the 27th turn,
+    re-evaluate the mode.  Enter defect mode if any of the following
     conditions hold:
 
     - Detected random:  Opponent cooperated 7-18 times since last mode 
@@ -689,7 +692,7 @@ def strategy(self, opponent: Player) -> Action:
             return D
         else:
             assert self.mode == "Normal"
-            
+
             # Look for mutual defects
             if self.history[-1] == D and opponent.history[-1] == D:
                 self.mutual_defect_streak += 1
@@ -699,7 +702,7 @@ def strategy(self, opponent: Player) -> Action:
                 self.mutual_defect_streak = 0
                 self.echo_streak = 0 # Reset both streaks.
                 return self.try_return(C)
-            
+
             # Look for echoes
             # Fortran code defaults two turns back to C if only second turn
             my_two_back, opp_two_back = C, C
@@ -719,6 +722,7 @@ def strategy(self, opponent: Player) -> Action:
             # Tit-for-tat
             return self.try_return(opponent.history[-1])
 
+
 class Cave(Player):
     """
     Strategy submitted to Axelrod's second tournament by Rob Cave (K49R), and
@@ -756,13 +760,15 @@ def strategy(self, opponent: Player) -> Action:
         if turn == 1: return C
 
         number_defects = opponent.defections
-        # Size of numerator is smaller than denomator -- How it was in the Fortran.
         perc_defects = number_defects / turn
 
         # If overly defect or appears random
-        if turn > 39 and perc_defects > 0.39: return D
-        if turn > 29 and perc_defects > 0.65: return D
-        if turn > 19 and perc_defects > 0.79: return D
+        if turn > 39 and perc_defects > 0.39:
+            return D
+        if turn > 29 and perc_defects > 0.65:
+            return D
+        if turn > 19 and perc_defects > 0.79:
+            return D
 
         if opponent.history[-1] == D:
             if number_defects > 17:
@@ -772,6 +778,7 @@ def strategy(self, opponent: Player) -> Action:
         else:
             return C
 
+
 class WmAdams(Player):
     """
     Strategy submitted to Axelrod's second tournament by William Adams (K44R),
@@ -809,3 +816,67 @@ def strategy(self, opponent: Player) -> Action:
         if number_defects > 9 and opponent.history[-1] == D:
             return random_choice((0.5) ** (number_defects - 9))
         return C
+
+class GraaskampKatzen(Player):
+    """
+    Strategy submitted to Axelrod's second tournament by Jim Graaskamp and Ken
+    Katzen (K60R), and came in sixth in that tournament.
+
+    Play Tit-for-Tat at first, and track own score.  At select checkpoints,
+    check for a high score.  Switch to Default Mode if:
+
+    - On move 11, score < 23
+    - On move 21, score < 53
+    - On move 31, score < 83
+    - On move 41, score < 113
+    - On move 51, score < 143
+    - On move 101, score < 293
+
+    Once in Defect Mode, defect forever.
+
+    Names:
+
+    - GraaskampKatzen: [Axelrod1980b]_
+    """
+
+    name = "GraaskampKatzen"
+    classifier = {
+        'memory_depth': float('inf'),
+        'stochastic': False,
+        'makes_use_of': set(['game']),
+        'long_run_time': False,
+        'inspects_source': False,
+        'manipulates_source': False,
+        'manipulates_state': False
+    }
+
+    def __init__(self):
+        super().__init__()
+        self.own_score = 0
+        self.mode = "Normal"
+
+    def update_score(self, opponent: Player):
+        game = self.match_attributes["game"]
+        last_round = (self.history[-1], opponent.history[-1])
+        self.own_score += game.score(last_round)[0]
+
+    def strategy(self, opponent: Player) -> Action:
+        if self.mode == "Defect":
+            return D
+
+        turn = len(self.history) + 1
+        if turn == 1:
+            return C
+
+        self.update_score(opponent)
+
+        if turn == 11 and self.own_score < 23 or \
+           turn == 21 and self.own_score < 53 or \
+           turn == 31 and self.own_score < 83 or \
+           turn == 41 and self.own_score < 113 or \
+           turn == 51 and self.own_score < 143 or \
+           turn == 101 and self.own_score < 293:
+            self.mode = "Defect"
+            return D
+
+        return opponent.history[-1] # Tit-for-Tat

axelrod/tests/strategies/test_axelrod_second.py

@@ -585,3 +585,39 @@ def test_strategy(self):
                    (C, D), (D, D), (C, D), (D, D), (C, C)]
         actions += [(C, C)] * 99
         self.versus_test(changed_man, expected_actions=actions, seed=1)
+
+class TestGraaskampKatzen(TestPlayer):
+    name = "GraaskampKatzen"
+    player = axelrod.GraaskampKatzen
+    expected_classifier = {
+        'memory_depth': float('inf'),
+        'stochastic': False,
+        'makes_use_of': set(["game"]),
+        'long_run_time': False,
+        'inspects_source': False,
+        'manipulates_source': False,
+        'manipulates_state': False
+    }
+
+    def test_strategy(self):
+        actions = [(C, C)] * 100  # Cooperate forever
+        self.versus_test(axelrod.Cooperator(), expected_actions=actions)
+
+        # GK does not great against
+        opponent_actions = [C, D, D] * 100
+        GK_Foil = axelrod.MockPlayer(actions=opponent_actions)
+        actions = [(C, C), (C, D), (D, D)]
+        actions += [(D, C), (C, D), (D, D)] * 2
+        actions += [(D, C)]
+        actions += [(D, D), (D, D), (D, C)] * 20 # Defect here on
+        self.versus_test(GK_Foil, expected_actions=actions)
+
+        # Fail on second checkpoint
+        opponent_actions = [C] * 10 + [C, D, D] * 100
+        Delayed_GK_Foil = axelrod.MockPlayer(actions=opponent_actions)
+        actions = [(C, C)] * 10
+        actions += [(C, C), (C, D), (D, D)]
+        actions += [(D, C), (C, D), (D, D)] * 2
+        actions += [(D, C)]
+        actions += [(D, D), (D, D), (D, C)] * 20 # Defect here on
+        self.versus_test(Delayed_GK_Foil, expected_actions=actions)

docs/reference/overview_of_strategies.rst

@@ -130,7 +130,7 @@ repository.
    "K57R_", "Rudy Nydegger", "Not Implemented"
    "K58R_", "Glen Rowsam", "Not Implemented"
    "K59R_", "Leslie Downing", "Not Implemented"
-   "K60R_", "Jim Graaskamp and Ken Katzen", "Not Implemented"
+   "K60R_", "Jim Graaskamp and Ken Katzen", ":class:`GraaskampKatzen <axelrod.strategies.axelrod_second.GraaskampKatzen>`"
    "K61R_", "Danny C Champion", ":class:`Champion <axelrod.strategies.axelrod_second.Champion>`"
    "K62R_", "Howard R Hollander", "Not Implemented"
    "K63R_", "George Duisman", "Not Implemented"