Merge http://github.com/Axelrod-Python/Axelrod

Conflicts:
	axelrod/tests/strategies/test_axelrod_second.py

Author: gaffney2010

CHANGES.md

@@ -1,3 +1,28 @@
+# v3.9.0, 2017-10-13
+
+New strategies, a minor bug fix and a small documentation improvement.
+
+- Add the Bush Mosteller strategy
+  https://github.com/Axelrod-Python/Axelrod/pull/1002
+- Add k42r from Fortran code
+  https://github.com/Axelrod-Python/Axelrod/pull/1135
+- Add MemoryDecay
+  https://github.com/Axelrod-Python/Axelrod/pull/1137
+- Add k32r from Fortran code
+  https://github.com/Axelrod-Python/Axelrod/pull/1138
+- Add Random Tit For Tat
+  https://github.com/Axelrod-Python/Axelrod/pull/1136
+- Add k42r from Fortran code
+  https://github.com/Axelrod-Python/Axelrod/pull/1139
+- Add reference to documentation
+  https://github.com/Axelrod-Python/Axelrod/pull/1134
+- Fix minor bug in the fingerprints
+  https://github.com/Axelrod-Python/Axelrod/pull/1140
+
+
+Here are all the commits for this PR:
+https://github.com/Axelrod-Python/Axelrod/compare/v3.9.0...v3.8.1
+
 # v3.8.1, 2017-10-13
 
 Minor change to behaviour of Champion

axelrod/tests/strategies/test_axelrod_second.py

@@ -509,30 +509,27 @@ def test_strategy(self):
         self.versus_test(axelrod.Cooperator(), expected_actions=actions)
 
         # It will take until turn 18 to respond decide to repond D->D
-        random.seed(1)
         actions = [(C, D)]
         actions += [(C, D), (D, D), (D, D), (C, D), (C, D), (C, D), (D, D),
                     (D, D), (C, D), (C, D), (D, D), (C, D), (D, D), (C, D),
                     (C, D), (D, D), (C, D)] # Randomly choose
         actions += [(D, D)] * 30 # Defect
-        self.versus_test(axelrod.Defector(), expected_actions=actions)
+        self.versus_test(axelrod.Defector(), expected_actions=actions, seed=1)
 
         # Highly-defective opponent
         # It will take until turn 20 to respond decide to repond D to C
         opponent_actions = [D] * 17 + [C, C, C, C]
         almost_defector = axelrod.MockPlayer(actions=opponent_actions)
 
-        random.seed(1)
         actions = [(C, D)]
         actions += [(C, D), (D, D), (D, D), (C, D), (C, D), (C, D), (D, D),
                     (D, D), (C, D), (C, D), (D, D), (C, D), (D, D), (C, D),
                     (C, D), (D, D), (C, C)] # Randomly choose
         actions += [(C, C)] # Coop for a minute
         actions += [(D, C), (D, C)]
-        self.versus_test(almost_defector, expected_actions=actions)
+        self.versus_test(almost_defector, expected_actions=actions, seed=1)
 
         #Here it will take until turn 40 to detect random and defect
-        random.seed(2)
         actions = [(C, C)]
         actions += [(C, D), (D, C), (C, D), (D, C), (C, D), (C, C), (C, D), 
                     (C, C), (C, D), (D, C), (C, D), (D, C), (C, D), (D, C), 
@@ -541,7 +538,7 @@ def test_strategy(self):
                     (C, D), (D, C), (C, D), (D, C), (C, D), (D, C), (C, D)] #Randomly choose 
         actions += [(D, C), (C, D), (D, C)] # 17 D have come, so tit for tat for a while
         actions += [(D, D), (D, C)] * 100 # Random finally detected
-        self.versus_test(axelrod.Alternator(), expected_actions=actions)
+        self.versus_test(axelrod.Alternator(), expected_actions=actions, seed=2)
 
 class TestCave(TestPlayer):
     name = "WmAdams"
@@ -577,4 +574,3 @@ def test_strategy(self):
         actions = [(C, D), (C, D), (C, D), (C, D), (C, D), (D, D), (C, D), (C, D), (D, D), (C, D), (D, D), (C, C)]
         actions += [(C,C)] * 99
         self.versus_test(changed_man, expected_actions=actions, seed=1)
-

axelrod/version.py

@@ -1 +1 @@
-__version__ = "3.8.1"
+__version__ = "3.9.0"

docs/reference/overview_of_strategies.rst

@@ -119,7 +119,7 @@ repository.
    "K46R_", "Graham J Eatherley", ":class:`Eatherley <axelrod.strategies.axelrod_second.Eatherley>`"
    "K47R_", "Richard Hufford", "Not Implemented"
    "K48R_", "George Hufford", "Not Implemented"
-   "K49R_", "Rob Cave", "Not Implemented"
+   "K49R_", "Rob Cave", ":class:`Cave <axelrod.strategies.axelrod_second.Cave>`"
    "K50R_", "Rik Smoody", "Not Implemented"
    "K51R_", "John Willaim Colbert", "Not Implemented"
    "K52R_", "David A Smith", "Not Implemented"