Merge branch 'master' of https://github.com/Axelrod-Python/Axelrod

Conflicts:
	axelrod/strategies/axelrod_second.py

Author: gaffney2010

README.rst

@@ -123,8 +123,8 @@ http://axelrod.readthedocs.org/en/latest/tutorials/contributing/index.html
 Publications
 ------------
 
-* Marc Harper, Vincent Knight, Martin Jones, Georgios Koutsovoulos, Nikoleta E. Glynatsi, Owen Campbell. `Reinforcement learning produces dominant strategies for the Iterated Prisoner’s Dilemma. <http://journals.plos.org/plosone/article/metrics?id=10.1371/journal.pone.0188046>`_. Plos One (2017). (`ArXiv Preprint <https://arxiv.org/abs/1707.06307>`_)
-* Knight, Vincent, Owen Campbell, Marc Harper, Karol Langner et al. `An Open Framework for the Reproducible Study of the Iterated Prisoner’s Dilemma. <https://openresearchsoftware.metajnl.com/articles/10.5334/jors.125/>`_ Journal of Open Research Software 4, no. 1 (2016). (`ArXiv Preprint <https://arxiv.org/abs/1604.00896>`_)
+* Marc Harper, Vincent Knight, Martin Jones, Georgios Koutsovoulos, Nikoleta E. Glynatsi, Owen Campbell. `Reinforcement learning produces dominant strategies for the Iterated Prisoner’s Dilemma. <http://journals.plos.org/plosone/article/metrics?id=10.1371/journal.pone.0188046>`_ Plos One (2017). (`ArXiv Preprint <https://arxiv.org/abs/1707.06307>`_)
+* Vincent Knight, Owen Campbell, Marc Harper, Karol Langner et al. `An Open Framework for the Reproducible Study of the Iterated Prisoner’s Dilemma. <https://openresearchsoftware.metajnl.com/articles/10.5334/jors.125/>`_ Journal of Open Research Software 4, no. 1 (2016). (`ArXiv Preprint <https://arxiv.org/abs/1604.00896>`_)
 
 
 Contributors 

axelrod/strategies/axelrod_second.py

@@ -1505,7 +1505,9 @@ def strategy(self, opponent: Player) -> Action:
             if len(opponent.history) >= go_back:
                 recent_history[-go_back] = opponent.history[-go_back]
 
-        return random_choice(self.prob_coop[tuple(recent_history)])
+        return random_choice(self.prob_coop[(recent_history[-3],
+                                             recent_history[-2],
+                                             recent_history[-1])])
 
 
 class White(Player):