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

New Strategies: Mem2, Pun1, Collective Strategy #795

Merged
merged 5 commits into from
Jan 1, 2017
Merged

New Strategies: Mem2, Pun1, Collective Strategy #795

merged 5 commits into from
Jan 1, 2017

Conversation

marcharper
Copy link
Member

@marcharper marcharper commented Dec 28, 2016

All from the literature.

@marcharper marcharper changed the title New Strategies: Mem2 and Pun1 New Strategies: Mem2, Pun1, Collective Strategy Dec 30, 2016
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.

Minor docstring requests from me.


FSMPlayer.__init__(self, transitions, initial_state=1, initial_action=C)


class Pun1(FSMPlayer):
"""FSM player described in [Ashlock2006]."""
Copy link
Member

Choose a reason for hiding this comment

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

Could you write this docstrings to match up with the convention (not all of them follow it yet, slow conversion :)). In particular for this it should have (appended to what is already there).

Names

    - Pun1 [Aslhlock2006]_

history of play is accessible.

Names
-----
Copy link
Member

Choose a reason for hiding this comment

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

No -----, just:

Names:

    - ...

Otherwise, CS will always defect.'

Names:
Collective Strategy [Li2009]
Copy link
Member

Choose a reason for hiding this comment

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

    - Collective Strategy

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

@meatballs meatballs merged commit e15b86e into master Jan 1, 2017
@meatballs meatballs deleted the mem2 branch January 1, 2017 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants