Second Tournament Documentation #1078

meatballs · 2017-07-21T12:18:21Z

This uses the following to generate the `fortrain_keys.rst` file: ``` import glob import pathlib strategy_files = glob.glob("./src/*.f") with open("/home/vince/src/Axelrod/docs/reference/fortan_keys.rst", "w") as f: for file in strategy_files: path = pathlib.Path(file) strategy_name = path.stem.upper() file_name = path.name f.write(".. _{}: https://github.com/Axelrod-Python/TourExec/blob/master/src/{}\n".format(strategy_name, file_name)) ```

Add keys to Fortran code in a separate file.

meatballs · 2017-07-21T12:22:35Z

An alternative option for the links in the third column is to insert references in the text that describes each strategy, use links to those refs in the table, but then have a link to the strategy index within the text

drvinceknight

Tiny typo but this looks glorious @meatballs. I reckon we could get rid of the text going over the strategies in the documentation and just use the fact that your table points at the source code (and thus the docstring). We could do the same for the other tournaments.

drvinceknight · 2017-07-21T13:31:39Z

docs/reference/overview_of_strategies.rst

@@ -250,7 +250,91 @@ This strategy plays randomly (disregarding the history of play).
 Axelrod's second tournament
 ---------------------------

-Work in progress.
+The code was for Axelrod's second touranment was originally published by the


Typo? The code for Axelrod's

marcharper · 2017-07-21T14:16:09Z

docs/reference/overview_of_strategies.rst

+The code for Axelrod's second touranment was originally published by the
+`University of Michigan Center for the Study of Complex Systems <http://lsa.umich.edu/cscs/>`_
+and is now available from
+`Robert Axelrod's personal website <http://www-personal.umich.edu/~axe/research/Software/CC/CC2.html>`_.


Can we explicitly add the "license" here from the source?

Not sure what you mean? Are you talking about the disclaimer on his site?

marcharper · 2017-07-21T14:16:59Z

docs/reference/overview_of_strategies.rst

+   "K56R_", "Quayle", "Not Implemented"
+   "K57R_", "Nydegger", ":class:`axelrod.strategies.axelrod_first.Nydegger`"
+   "K58R_", "Rowsam", "Not Implemented"
+   "K59R_", "Downing", "Not Implemented"


We have RevisedDowning, which may be the same.

I'll put a note to that effect

marcharper · 2017-07-21T14:17:10Z

docs/reference/overview_of_strategies.rst

+   "K57R_", "Nydegger", ":class:`axelrod.strategies.axelrod_first.Nydegger`"
+   "K58R_", "Rowsam", "Not Implemented"
+   "K59R_", "Downing", "Not Implemented"
+   "K60R_", "Graaskamp", "Not Implemented"


Someone was just working on this one...

I'll put a WIP note

marcharper · 2017-07-21T14:17:32Z

docs/reference/overview_of_strategies.rst

+   "K31R_", "Grisell", "Not Implemented"
+   "K32R_", "Kluepfel", "Not Implemented"
+   "K33R_", "Rabbie", "Not Implemented"
+   "K34R_", "Friedman", "Not Implemented"


I think maybe we have this one under another name.

Yep. It's Grudger

marcharper · 2017-07-21T14:18:13Z

docs/reference/overview_of_strategies.rst

+   "K71R_", "Hill", "Not Implemented"
+   "K72R_", "White", "Not Implemented"
+   "K73R_", "Zimmerman", "Not Implemented"
+   "K74R_", "Friedland", "Not Implemented"


No. He submitted two separate strategies but there's no name other than his own or the K74R and K74RXX

I'm guessing that's why the second of those has 'XX' in its code.

I suggest we leave it as is for the moment. Come the point when we translate this into Python, we'll have to come up with some sort of unique name for them but, until then, it's unimportant.

marcharper · 2017-07-21T14:20:04Z

docs/reference/overview_of_strategies.rst

+   "K83R_", "Black", "Not Implemented"
+   "K84R_", "Tideman Chieruzz", "Not Implemented"
+   "K85R_", "Falk Langste", "Not Implemented"
+   "K86R_", "Grofman", "Not Implemented"


It's in Axelrod First

I'll fix that

marcharper · 2017-07-21T14:21:03Z

docs/reference/overview_of_strategies.rst

+   "K90R_", "Smith", "Not Implemented"
+   "K91R_", "Pinkley", "Not Implemented"
+   "K92R_", "Rapoport", "Not Implemented"
+   "K93R_", "Unknown", "Not Implemented"


Also in Axelrod First but I recall not being sure the implementation was completely correct

Is that the 'Unamed Strategy'?

marcharper · 2017-07-21T14:21:34Z

docs/reference/overview_of_strategies.rst

+   "K44R_", "Adams", "Not Implemented"
+   "K45R_", "Mcgurrin", "Not Implemented"
+   "K46R_", "Eatherley", ":class:`axelrod.strategies.axelrod_second.Eatherley`"
+   "K47R_", "Hufford", "Not Implemented"


Names repeated...

Yep, there are some authors who submitted more than one strategy. I'm just listing the name here at the moment and not attempting to make it unique in any way.

marcharper · 2017-07-21T14:23:45Z

A few minor comments from me, looks good :)

meatballs · 2017-07-21T15:32:55Z

I could change the second column in the table to be the author's name and then give their full name rather than just the last name.

That would make it explicit that we are talking about the author and not the name of the strategy.

drvinceknight · 2017-07-21T15:38:19Z

I like that idea (author name).

meatballs · 2017-07-21T15:39:56Z

I'm onto to it and it's already cleared up one issue - the two called Hufford were by two different people, Richard and George Hufford!

meatballs · 2017-07-21T16:43:52Z

I think I'm done with this one

meatballs · 2017-07-21T18:32:25Z

Hang on, got another improvement coming.....

meatballs · 2017-07-21T18:38:48Z

Really done this time

marcharper · 2017-07-22T01:05:53Z

docs/reference/overview_of_strategies.rst

+The code for Axelrod's second touranment was originally published by the
+`University of Michigan Center for the Study of Complex Systems <http://lsa.umich.edu/cscs/>`_
+and is now available from
+`Robert Axelrod's personal website <http://www-personal.umich.edu/~axe/research/Software/CC/CC2.html>`_


Can we copy the actual permissions "You are free to download these materials and use them without restriction" since that page may not last forever? Or am I being paranoid?

Done

Or am I being paranoid?

Just because you're paranoid, it doesn't mean they aren't out to get you!

drvinceknight

Looking really good @meatballs.

drvinceknight · 2017-07-22T10:52:02Z

docs/reference/overview_of_strategies.rst

+   "K90R_", "John Maynard Smith", "Not Implemented"
+   "K91R_", "Jonathan Pinkley", "Not Implemented"
+   "K92R_", "Anatol Rapoport", "Not Implemented"
+   "K93R_", "Unknown. Probably Robert Axelrod", ":class:`UnnamedStrategy <axelrod.strategies.axelrod_first.UnnamedStrategy>`"


The author wasn't Robert Axelrod:

Apparently written by a grad student in political science whose name was withheld, this strategy cooperates with a given probability P.

Perhaps: Unnamed Graduate Student as author? Or perhaps just Unknown...?

drvinceknight · 2017-07-22T11:00:37Z

Looks good to me. I'll let @marcharper press go.

meatballs and others added 9 commits July 20, 2017 17:58

Add main text for second tournament

4a218e4

[#1074] Improve table headings

b651f53

Merge pull request #1076 from Axelrod-Python/issue-1074-vk

e8293bc

Add keys to Fortran code in a separate file.

[#1074] Add table for second tournament strategies

c45622e

[#1074] Add names for second tournament strategies

cdb5fc8

[#1074] Add some of the implemented strategy refs

da23ce2

[#1074] Use csv table and class references for second tournament

e973fe2

[#1074] Remove duplicate line of text

fbb58fb

drvinceknight requested changes Jul 21, 2017

View reviewed changes

[#1074] Fix typo

bce7ff2

drvinceknight added the ready-to-merge label Jul 21, 2017

drvinceknight approved these changes Jul 21, 2017

View reviewed changes

marcharper approved these changes Jul 21, 2017

View reviewed changes

meatballs added 6 commits July 21, 2017 16:03

[#1074] Add disclaimer and links to further implemented strategies

32f1c8c

[#1074] Alter column widths and wording to fit

de6a4f2

[#1074] Correct links to downing and unnamed strategies

cd356cb

[#1074] Add link to grudger for friedman

d795c43

[#1074] Remove the possibly proviso from the downing link

8179e22

[#1074] Fix typo

54ea1ea

meatballs added 3 commits July 21, 2017 16:48

[#1074] Add author names for second tournament

e817ee8

[#1074] Fix typos

49d96d3

[#1074] Fix column widths

6e1aff7

[#1074] Remove column width definitions

d6648f0

[#1074] Add titles to cross references

fac2b2a

marcharper reviewed Jul 22, 2017

View reviewed changes

[#1074] Add disclaimer text

b16c778

drvinceknight requested changes Jul 22, 2017

View reviewed changes

drvinceknight removed the ready-to-merge label Jul 22, 2017

[#1074] Correct author for unnamed strategy

db898ed

drvinceknight approved these changes Jul 22, 2017

View reviewed changes

drvinceknight added the ready-to-merge label Jul 22, 2017

marcharper merged commit cbec9ed into master Jul 22, 2017

meatballs deleted the issue-1074 branch July 28, 2017 09:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Second Tournament Documentation #1078

Second Tournament Documentation #1078

meatballs commented Jul 21, 2017

meatballs commented Jul 21, 2017

drvinceknight left a comment

drvinceknight Jul 21, 2017

marcharper Jul 21, 2017

meatballs Jul 21, 2017

marcharper Jul 21, 2017

meatballs Jul 21, 2017

marcharper Jul 21, 2017

meatballs Jul 21, 2017

marcharper Jul 21, 2017

meatballs Jul 21, 2017

marcharper Jul 21, 2017

meatballs Jul 21, 2017

meatballs Jul 21, 2017

marcharper Jul 21, 2017

meatballs Jul 21, 2017

marcharper Jul 21, 2017

meatballs Jul 21, 2017

marcharper Jul 21, 2017

meatballs Jul 21, 2017

marcharper commented Jul 21, 2017

meatballs commented Jul 21, 2017

drvinceknight commented Jul 21, 2017

meatballs commented Jul 21, 2017

meatballs commented Jul 21, 2017

meatballs commented Jul 21, 2017

meatballs commented Jul 21, 2017

marcharper Jul 22, 2017

meatballs Jul 22, 2017 •

edited

drvinceknight left a comment

drvinceknight Jul 22, 2017

drvinceknight Jul 22, 2017

drvinceknight commented Jul 22, 2017

Second Tournament Documentation #1078

Second Tournament Documentation #1078

Conversation

meatballs commented Jul 21, 2017

meatballs commented Jul 21, 2017

drvinceknight left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcharper commented Jul 21, 2017

meatballs commented Jul 21, 2017

drvinceknight commented Jul 21, 2017

meatballs commented Jul 21, 2017

meatballs commented Jul 21, 2017

meatballs commented Jul 21, 2017

meatballs commented Jul 21, 2017

Choose a reason for hiding this comment

meatballs Jul 22, 2017 • edited

Choose a reason for hiding this comment

drvinceknight left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

drvinceknight commented Jul 22, 2017

meatballs Jul 22, 2017 •

edited