Skip to content

Implemented strategy Cave (k49r from Axelrod's Second) #1141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
Nov 19, 2017
Merged

Implemented strategy Cave (k49r from Axelrod's Second) #1141

merged 5 commits into from
Nov 19, 2017

Conversation

gaffney2010
Copy link
Member

Fingerprints below:

basic_fortran_cave
basic_python_cave
prob_fortran_cave
prob_python_cave

@gaffney2010
Copy link
Member Author

Noticed a slight difference in the fingerprints. Found that the Fortran was calculating percentage wrong. Put the same logic in my code. Fingerprints match better now.
basic_fortran_cave
basic_python_cave
prob_fortran_cave
prob_python_cave

@gaffney2010 gaffney2010 reopened this Nov 18, 2017
@gaffney2010
Copy link
Member Author

Fixed one of my tests for the calculation issue I fixed in last commit.

@gaffney2010 gaffney2010 reopened this Nov 19, 2017
drvinceknight
drvinceknight requested changes Nov 19, 2017
View reviewed changes
Copy link
Member

@drvinceknight drvinceknight left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great (these PRs are awesome), just the one adjustment to the seeds in the test and could you also add the strategy to the second tournament docs?

axelrod/tests/strategies/test_axelrod_second.py Outdated
(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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we put the seed argument in to self.versus_test please:

self.versus_test(axelrod.Defector(), expected_actions=actions, seed=1)

Same below.

@drvinceknight
Copy link
Member

I have gone through the logic and agree this strategy is correctly implemented (as well as the great match of the fps).

@drvinceknight
Copy link
Member

This is looking good to me. Thanks again @gaffney2010!

@meatballs meatballs merged commit 36ac9a4 into Axelrod-Python:master Nov 19, 2017
@drvinceknight drvinceknight mentioned this pull request Nov 19, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drvinceknight drvinceknight drvinceknight approved these changes

Assignees
No one assigned
Labels
ready-to-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gaffney2010 @drvinceknight @meatballs