Skip to content
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
merged 31 commits into from
Dec 11, 2019

Commits on Nov 18, 2019

  1. Rename second tournament strategies to SecondBy

    Happy to change the prefix etc...
    drvinceknight committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    7520eec View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2019

  1. Modify name of Davis and Feld.

    Also make minor docstring amendments.
    
    Also made some notes regarding Downing.
    drvinceknight committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    b5e8310 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0bf356c View commit details
    Browse the repository at this point in the history
  3. First first by Grofman.

    drvinceknight committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    8c59778 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d4e1552 View commit details
    Browse the repository at this point in the history
  5. Fix Nydegger.

    drvinceknight committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    33c903f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    aa417a1 View commit details
    Browse the repository at this point in the history
  7. Rename and fix Tullock.

    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.
    drvinceknight committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    3dc60fb View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2019

  1. Configuration menu
    Copy the full SHA
    75ee7c5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b54c272 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    061e7f2 View commit details
    Browse the repository at this point in the history
  4. Revise Tideman and Cheruzzi.

    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).
    drvinceknight committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    0dde6e2 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2019

  1. Re-implement Downing.

    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.
    drvinceknight committed Nov 30, 2019
    Configuration menu
    Copy the full SHA
    eccd7e2 View commit details
    Browse the repository at this point in the history
  2. Modify Shubik.

    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.
    drvinceknight committed Nov 30, 2019
    Configuration menu
    Copy the full SHA
    dc7a710 View commit details
    Browse the repository at this point in the history
  3. Adjust tests.

    drvinceknight committed Nov 30, 2019
    Configuration menu
    Copy the full SHA
    659d997 View commit details
    Browse the repository at this point in the history
  4. Adjust doctests.

    drvinceknight committed Nov 30, 2019
    Configuration menu
    Copy the full SHA
    ce1d6e6 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Configuration menu
    Copy the full SHA
    6e6a573 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d8cee8d View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

  1. Configuration menu
    Copy the full SHA
    f4e162b View commit details
    Browse the repository at this point in the history
  2. Update docs.

    drvinceknight committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    ecbd9c0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0c31588 View commit details
    Browse the repository at this point in the history
  4. Fix a typo.

    drvinceknight committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    e6b9349 View commit details
    Browse the repository at this point in the history
  5. Fix failing test.

    drvinceknight committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    e7cf5ad View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2019

  1. Rename SecondByDowning -> RevisedDowning.

    I have moved this to it's own module/file.
    drvinceknight committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    a6471e8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6c46483 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e396646 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b9b00a2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    49e8983 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d24c304 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    468a829 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    36e82a2 View commit details
    Browse the repository at this point in the history