-
Notifications
You must be signed in to change notification settings - Fork 278
299 - Docs #372
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
299 - Docs #372
Conversation
297 - demo_strategies and make basic_strategies dynamic
Conflicts: .travis.yml CHANGES.txt setup.py
For when use python setup.py develop.
I've added this branch to readthedocs, so we can see the results at http://axelrod.readthedocs.org/en/299/ (or by selecting '299' from the versions drop down at the bottom LHS). |
👍 🎆 🎉 , will wait to see what you think @meatballs (no huge rush). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should mention here that a round robin also includes self-interactions
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a good point. Will do.
On 22 October 2015 at 17:35, Owen Campbell notifications@github.com wrote:
In docs/reference/glossary.rst
#372 (comment):+A match is a consecutive number of turns. The default number of turns
+used in the tournament is 200. Here is a single match between two players over
+10 turns::
+
p1, p2 = axl.Cooperator(), axl.Defector()
for turn in range(10):
- ... p1.play(p2)
p1.history, p2.history
- (['C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C'], ['D', 'D', 'D', 'D', 'D', 'D', 'D', 'D', 'D', 'D'])
+A round robin
+-------------
+
+A round robin is the set of all potential (order invariant) matches between
+a given collection of players.
+We should mention here that a round robin also includes self-interactions
—
Reply to this email directly or view it on GitHub
https://github.com/Axelrod-Python/Axelrod/pull/372/files#r42772158.
Dr Vincent Knight
Cardiff School of Mathematics
Senghennydd Road,
Cardiff
CF24 4AG
(+44) 29 2087 5548
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, I don't think we should, this self-interaction is only relevant to the playoff matrix but (shouldn't be) isn't relevant to an actual tournament.
I'm done being picky. This is an excellent job. Chapeau! |
Extremely helpful @meatballs, great finds throughout. Off to walk the puppy and will address them later. |
- Adding '2 round from end' for Backstabber and Doublecrosser. - Correct tense in getting started. - Correct spelling of persistent. - Fix include to including. - Spelling of used to use.
Made all the changes apart from Not too sure what's best for |
Not all the images are right/correct version. Do not merge. |
Good to go. |
I'll let @meatballs push the button since he's clearly looked more closely. |
Just a nudge @meatballs in case this has gone unnoticed: apart from my one comment about your round robin suggestion I think this is good to go. No worries if you're busy :) |
sorry. this had passed me by |
I'm opening a PR as I feel like I'm getting somewhere with this and would like to have @marcharper @meatballs and (I know you're busy but tagging in case) @langner's opinion.
This achieves two main things:
There are still some things left to do (I haven't done them yet just because I'm tired and want to go to 💤):
Let me know your thoughts. Also, if anything new comes in while this PR is still ongoing (which will no doubt be the case) please comment here just so that I know about it...