Skip to content

Conversation

drvinceknight
Copy link
Member

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:

  • Doctests: everything (a part from stochastic stuff) is doctested. This is important, I caught a couple of things that aren't quite right in the current docs. Travis should be set up to run the doctests also. These are run from a './doctest.sh' script.
  • Modularisation: There are two main parts to the docs, reference (I have basically not touched this apart from introducing doctests) and tutorials. The tutorials are hopefully a bit more streamlined and very much separated out. There are currently three types (outside of contributions) tutorials:
    • getting started: The basics
    • further topics: so far just classification and morality metrics
    • advanced: nothing yet but perhaps some neat tournaments etc... (like stuff that @marcharper has done?) could go here

There are still some things left to do (I haven't done them yet just because I'm tired and want to go to 💤):

  • No tutorial for the command line tool
  • A lot missing from contributions (but this can be lifted from status quo)
  • The automatically generated docs for the strategies, are not in. I have no idea if this had something to do with breaking readthedocs a while back and will ease this back in at the last moment.

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...

@drvinceknight drvinceknight changed the title ⚠️ DO NOT MERGE 299 - Docs ⚠️ DO NOT MERGE 299 - Docs Oct 18, 2015
@meatballs
Copy link
Member

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).

@drvinceknight
Copy link
Member Author

Looks good to me -- definitely an improvement!

👍 🎆 🎉 , will wait to see what you think @meatballs (no huge rush).

Copy link
Member

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

Copy link
Member Author

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

Copy link
Member Author

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.

@meatballs
Copy link
Member

I'm done being picky. This is an excellent job. Chapeau!

@drvinceknight
Copy link
Member Author

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.
@drvinceknight
Copy link
Member Author

Made all the changes apart from round_robin (one of my outdated comments was asking about is/are variety but I'm really not bothered so just went with is).

Not too sure what's best for round_robin. I understand why you want to raise that (relevant to payoff matrix) but I think that from the point of view of the getting started guide it's perhaps easiest to leave it as that?

@drvinceknight
Copy link
Member Author

Not all the images are right/correct version. Do not merge.

@drvinceknight
Copy link
Member Author

Good to go.

@marcharper
Copy link
Member

I'll let @meatballs push the button since he's clearly looked more closely.

@marcharper marcharper mentioned this pull request Oct 23, 2015
@drvinceknight
Copy link
Member Author

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 :)

@meatballs
Copy link
Member

sorry. this had passed me by

meatballs added a commit that referenced this pull request Oct 24, 2015
@meatballs meatballs merged commit 06d075a into master Oct 24, 2015
@meatballs meatballs removed the ready label Oct 24, 2015
marcharper pushed a commit to marcharper/Axelrod that referenced this pull request Nov 2, 2015
@drvinceknight drvinceknight deleted the 299 branch November 8, 2015 07:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants