Merge pull request #1154 from gaffney2010/master

Implemented White strategy, k72r from Axelrod's Second

Author: drvinceknight

axelrod/strategies/_strategies.py

@@ -10,7 +10,7 @@
 from .axelrod_second import (
     Champion, Eatherley, Tester, Gladstein, Tranquilizer, MoreGrofman,
     Kluepfel, Borufsen, Cave, WmAdams, GraaskampKatzen, Weiner, Harrington,
-    MoreTidemanAndChieruzzi, Getzler, Leyvraz)
+    MoreTidemanAndChieruzzi, Getzler, Leyvraz, White)
 from .backstabber import BackStabber, DoubleCrosser
 from .better_and_better import BetterAndBetter
 from .bush_mosteller import BushMosteller
@@ -276,6 +276,7 @@
     TwoTitsForTat,
     VeryBad,
     Weiner,
+    White,
     Willing,
     Winner12,
     Winner21,

axelrod/strategies/axelrod_second.py

@@ -1137,7 +1137,7 @@ def calculate_chi_squared(self, turn):
         In this function, the statistic is non-standard in that it excludes
         summands where E_i <= 1.
         """
-        
+
         denom = turn - 2
 
         expected_matrix = np.outer(self.move_history.sum(axis=1),
@@ -1165,7 +1165,7 @@ def detect_random(self, turn):
         self.history, and returns True (is random) if and only if the statistic
         is less than or equal to 3.
         """
-        
+
         denom = turn - 2
 
         if self.move_history[0, 0] / denom >= 0.8:
@@ -1300,7 +1300,7 @@ def strategy(self, opponent: Player) -> Action:
         if self.burned or random.random() > self.prob:
             # Tit-for-Tat with probability 1-`prob`
             return self.try_return(opponent.history[-1], inc_parity=True)
-        
+
         # Otherwise Defect, Cooperate, Cooperate, and increase `prob`
         self.prob += 0.05
         self.more_coop, self.last_generous_n_turns_ago = 2, 1
@@ -1421,7 +1421,7 @@ def strategy(self, opponent: Player) -> Action:
 class Getzler(Player):
     """
     Strategy submitted to Axelrod's second tournament by Abraham Getzler (K35R)
-    and came in tenth in that tournament.
+    and came in eleventh in that tournament.
 
     Strategy Defects with probability `flack`, where `flack` is calculated as
     the sum over opponent Defections of 0.5 ^ (turns ago Defection happened).
@@ -1459,7 +1459,7 @@ def strategy(self, opponent: Player) -> Action:
 class Leyvraz(Player):
     """
     Strategy submitted to Axelrod's second tournament by Fransois Leyvraz
-    (K68R) and came in eleventh in that tournament.
+    (K68R) and came in twelfth in that tournament.
 
     The strategy uses the opponent's last three moves to decide on an action
     based on the following ordered rules.
@@ -1508,3 +1508,40 @@ def strategy(self, opponent: Player) -> Action:
         return random_choice(self.prob_coop[(recent_history[-3],
                                              recent_history[-2],
                                              recent_history[-1])])
+
+
+class White(Player):
+    """
+    Strategy submitted to Axelrod's second tournament by Edward C White (K72R)
+    and came in thirteenth in that tournament.
+
+    * If the opponent Cooperated last turn or in the first ten turns, then
+      Cooperate.
+    * Otherwise Defect if and only if:
+        floor(log(turn)) * opponent Defections >= turn
+
+    Names:
+
+    - White: [Axelrod1980b]_
+    """
+
+    name = 'White'
+    classifier = {
+        'memory_depth': float("inf"),
+        'stochastic': False,
+        'makes_use_of': set(),
+        'long_run_time': False,
+        'inspects_source': False,
+        'manipulates_source': False,
+        'manipulates_state': False
+    }
+
+    def strategy(self, opponent: Player) -> Action:
+        turn = len(self.history) + 1
+
+        if turn <= 10 or opponent.history[-1] == C:
+            return C
+
+        if np.floor(np.log(turn)) * opponent.defections >= turn:
+            return D
+        return C

axelrod/tests/strategies/test_axelrod_second.py

@@ -960,3 +960,34 @@ def test_strategy(self):
         self.versus_test(axelrod.Alternator(), expected_actions=actions, seed=2)
         actions = [(C, C), (C, D), (C, C)] + [(D, D), (C, C)] * 3
         self.versus_test(axelrod.Alternator(), expected_actions=actions, seed=3)
+
+
+class TestWhite(TestPlayer):
+    name = 'White'
+    player = axelrod.White
+    expected_classifier = {
+        'memory_depth': float("inf"),
+        'stochastic': False,
+        'makes_use_of': set(),
+        'long_run_time': False,
+        'inspects_source': False,
+        'manipulates_source': False,
+        'manipulates_state': False
+    }
+
+    def test_strategy(self):
+        actions = [(C, C)] * 30
+        self.versus_test(axelrod.Cooperator(), expected_actions=actions)
+
+        actions = [(C, D)] * 10 + [(D, D)] * 20
+        self.versus_test(axelrod.Defector(), expected_actions=actions)
+
+        actions = [(C, D), (C, D), (C, C), (C, C), (C, C), (C, D), (C, C),
+                   (C, D), (C, C), (C, D), (C, C), (C, D), (C, D), (D, C),
+                   (C, D), (D, D), (D, C), (C, D), (D, D), (D, C)]
+        self.versus_test(axelrod.Random(0.5), expected_actions=actions, seed=6)
+        actions = [(C, C), (C, D), (C, D), (C, C), (C, C), (C, C), (C, C),
+                   (C, D), (C, D), (C, D), (C, D), (D, D), (D, C), (C, C),
+                   (C, C), (C, D), (C, C), (C, D), (C, C), (C, D)]
+        self.versus_test(axelrod.Random(0.5), expected_actions=actions, seed=12)
+

docs/reference/overview_of_strategies.rst

@@ -140,7 +140,7 @@ repository.
    "K69R_", "Johann Joss", "Not Implemented"
    "K70R_", "Robert Pebly", "Not Implemented"
    "K71R_", "James E Hall", "Not Implemented"
-   "K72R_", "Edward C White Jr", "Not Implemented"
+   "K72R_", "Edward C White Jr", ":class:`White <axelrod.strategies.axelrod_second.White>`"
    "K73R_", "George Zimmerman", "Not Implemented"
    "K74R_", "Edward Friedland", "Not Implemented"
    "K74RXX_", "Edward Friedland", "Not Implemented"