-
Notifications
You must be signed in to change notification settings - Fork 264
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.
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
Re factor/implement first tournament strategies #1275
Merged
meatballs
merged 31 commits into
master
from
fix-first-tournament-second-tournament-confusion
Dec 11, 2019
Merged
Re factor/implement first tournament strategies #1275
meatballs
merged 31 commits into
master
from
fix-first-tournament-second-tournament-confusion
Dec 11, 2019
Commits on Nov 18, 2019
-
Rename second tournament strategies to
SecondBy
Happy to change the prefix etc...
Configuration menu - View commit details
-
Copy full SHA for 7520eec - Browse repository at this point
Copy the full SHA 7520eecView commit details
Commits on Nov 20, 2019
-
Modify name of Davis and Feld.
Also make minor docstring amendments. Also made some notes regarding Downing.
Configuration menu - View commit details
-
Copy full SHA for b5e8310 - Browse repository at this point
Copy the full SHA b5e8310View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0bf356c - Browse repository at this point
Copy the full SHA 0bf356cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c59778 - Browse repository at this point
Copy the full SHA 8c59778View commit details -
Configuration menu - View commit details
-
Copy full SHA for d4e1552 - Browse repository at this point
Copy the full SHA d4e1552View commit details -
Configuration menu - View commit details
-
Copy full SHA for 33c903f - Browse repository at this point
Copy the full SHA 33c903fView commit details -
Configuration menu - View commit details
-
Copy full SHA for aa417a1 - Browse repository at this point
Copy the full SHA aa417a1View commit details -
I believe the logic was slightly faulty for Tullock: the first 11 moves was correct however once past there we should only be considering the 10 previous moves.
Configuration menu - View commit details
-
Copy full SHA for 3dc60fb - Browse repository at this point
Copy the full SHA 3dc60fbView commit details
Commits on Nov 21, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 75ee7c5 - Browse repository at this point
Copy the full SHA 75ee7c5View commit details -
Configuration menu - View commit details
-
Copy full SHA for b54c272 - Browse repository at this point
Copy the full SHA b54c272View commit details -
Configuration menu - View commit details
-
Copy full SHA for 061e7f2 - Browse repository at this point
Copy the full SHA 061e7f2View commit details -
As noted by @id428 we were not giving a "true" fresh start so I've implemented that. I also added the two final defections (when the game length is known).
Configuration menu - View commit details
-
Copy full SHA for 0dde6e2 - Browse repository at this point
Copy the full SHA 0dde6e2View commit details
Commits on Nov 30, 2019
-
This is a complete rewrite of the Downing strategy. To be able to do this I've used the description in Downing's 1975 paper. This description itself is not sufficiently clear and so I've had to make some further assumptions which I've clearly documented. Note: there was documentation claiming that there was a bug in the implementation in the original tournament. I believe this was a mistake due to a misinterpretation of one online set of slides where they commented that there was a mistake in the implementation. This however was not a bug and was actually described quite a lot in Axelrod's original tournament: the strategy was implemented to act a particular way in the first two rounds and this had the result of making the strategy a king maker. This however was not a bug, just a particular interpretation of the overall decision rule described in Downing's 1975 paper.
Configuration menu - View commit details
-
Copy full SHA for eccd7e2 - Browse repository at this point
Copy the full SHA eccd7e2View commit details -
Note that this was not the specific error that @id428 pointed out but having reviewed the papers and source code I found this one minor inaccuracy. @id428 made a point that the strategy should cooperate twice after it's round of retaliations but I do not see this in any of the descriptions of the strategy. Once the strategy has finished retaliating, all the texts indicate that it cooperates again but ready to retaliate.
Configuration menu - View commit details
-
Copy full SHA for dc7a710 - Browse repository at this point
Copy the full SHA dc7a710View commit details -
Configuration menu - View commit details
-
Copy full SHA for 659d997 - Browse repository at this point
Copy the full SHA 659d997View commit details -
Configuration menu - View commit details
-
Copy full SHA for ce1d6e6 - Browse repository at this point
Copy the full SHA ce1d6e6View commit details
Commits on Dec 2, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 6e6a573 - Browse repository at this point
Copy the full SHA 6e6a573View commit details -
Configuration menu - View commit details
-
Copy full SHA for d8cee8d - Browse repository at this point
Copy the full SHA d8cee8dView commit details
Commits on Dec 3, 2019
-
Configuration menu - View commit details
-
Copy full SHA for f4e162b - Browse repository at this point
Copy the full SHA f4e162bView commit details -
Configuration menu - View commit details
-
Copy full SHA for ecbd9c0 - Browse repository at this point
Copy the full SHA ecbd9c0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0c31588 - Browse repository at this point
Copy the full SHA 0c31588View commit details -
Configuration menu - View commit details
-
Copy full SHA for e6b9349 - Browse repository at this point
Copy the full SHA e6b9349View commit details -
Configuration menu - View commit details
-
Copy full SHA for e7cf5ad - Browse repository at this point
Copy the full SHA e7cf5adView commit details
Commits on Dec 5, 2019
-
Rename SecondByDowning -> RevisedDowning.
I have moved this to it's own module/file.
Configuration menu - View commit details
-
Copy full SHA for a6471e8 - Browse repository at this point
Copy the full SHA a6471e8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6c46483 - Browse repository at this point
Copy the full SHA 6c46483View commit details -
Configuration menu - View commit details
-
Copy full SHA for e396646 - Browse repository at this point
Copy the full SHA e396646View commit details -
Configuration menu - View commit details
-
Copy full SHA for b9b00a2 - Browse repository at this point
Copy the full SHA b9b00a2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 49e8983 - Browse repository at this point
Copy the full SHA 49e8983View commit details -
Configuration menu - View commit details
-
Copy full SHA for d24c304 - Browse repository at this point
Copy the full SHA d24c304View commit details -
Configuration menu - View commit details
-
Copy full SHA for 468a829 - Browse repository at this point
Copy the full SHA 468a829View commit details -
Configuration menu - View commit details
-
Copy full SHA for 36e82a2 - Browse repository at this point
Copy the full SHA 36e82a2View commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.