[MRG] Add Resurrection Strategy

[souravsingh]

No description provided.

[drvinceknight]

You have named this incorrectly.

The class will also need tests.

[souravsingh]

Travis seems to error due to this line- https://github.com/Axelrod-Python/Axelrod/pull/865/files#diff-ac262d93edeeeaa83660b643a34b6580R35.

Is there a fix for this?

[drvinceknight]

Yes the error is occurring because your strategy logic is not quite correct:

+        if self.history:
 +            return C
 +        if len(self.history) >= 5 and self.history[-5:] == [D,D,D,D,D]:
 +            return D
 +        else:
 +            return opponent.history[-1]

That first line if self.history will pass as True if self.history is not empty which implies that if there is no history then you pass on to the next set of statements which in turn leads to return opponent.history[-1] however as there is no history, this creates an error.

I believe you want:

+        if len(self.history) == 0:
 +            return C
 +        if len(self.history) >= 5 and self.history[-5:] == [D,D,D,D,D]:
 +            return D
 +        else:
 +            return opponent.history[-1]

[souravsingh]

Thanks a lot @drvinceknight

[souravsingh]

The tests for the strategy pass.

[souravsingh]

@marcharper I need some help in finishing the PR.

[drvinceknight]

@marcharper I need some help in finishing the PR

The tests are currently failing because of the doctests, you need to update the relevant docs:.

======================================================================
FAIL: ./docs/tutorials/advanced/classification_of_strategies.rst
Doctest: classification_of_strategies.rst
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/opt/python/3.5.2/lib/python3.5/doctest.py", line 2190, in runTest
    raise self.failureException(self.format_failure(new.getvalue()))
AssertionError: Failed doctest test for classification_of_strategies.rst
  File "./docs/tutorials/advanced/classification_of_strategies.rst", line 0
----------------------------------------------------------------------
File "./docs/tutorials/advanced/classification_of_strategies.rst", line 59, in classification_of_strategies.rst
Failed example:
    len(strategies)
Expected:
    27
Got:
    28
----------------------------------------------------------------------
File "./docs/tutorials/advanced/classification_of_strategies.rst", line 71, in classification_of_strategies.rst
Failed example:
    len(strategies)
Expected:
    48
Got:
    49

[souravsingh]

Done! Fixed the Errors!

[marcharper]

minor: "the the"

[marcharper]

Can you mention that the strategy plays like TFT otherwise?

[marcharper]

Can we add two tests for TFT behaviors after five rounds, and one for more than five rounds, with four defections and a cooperation by the opponent?

[souravsingh]

@marcharper Just to confirm- For first test, the player_history=[C,C,C,C,C,C] and opponent_history=[C,C,C,C,C,D]
And for second test- the player_history=[C,C,C,C,C] and opponent_history=[C,D,D,D,D], correct?

[marcharper]

@souravsingh Just a request for a few more tests, otherwise it's looking good to me.

[marcharper]

"strategy"

[souravsingh]

Is the patch ready for merging?

[drvinceknight]

Sorry for taking a little while to get back to this, just two very minor things from me.

[drvinceknight]

Very minor: could you tidy the PEP8 here: [D, D, D, D, D].

[drvinceknight]

and the last five rounds

[drvinceknight]

Also, can you add this module to the index of strategies (so that it's automatically indexed). See http://axelrod.readthedocs.io/en/latest/tutorials/contributing/strategy/adding_the_new_strategy.html:

Finally, if you have created a new module (a new <strategy.py> file) please add it to the docs/references/all_strategies.rst file so that it will automatically be documented.