Add sources for some strategies. #1041

drvinceknight · 2017-06-05T18:58:47Z

Ongoing work on #225

marcharper · 2017-06-06T00:35:11Z

axelrod/strategies/calculator.py

+
+    Names:
+
+    - Calculator: Original name by Marc Harper


It's not mine -- it's in PRISON and likely predates it (it's in the file of classic strategies). Maybe one of the original Axelrod tournaments?

Thanks. I don't think it's one of the original tournaments I'll go with PRISON.

marcharper · 2017-06-06T00:35:48Z

axelrod/strategies/alternator.py

+
+    Names
+
+    - Alternator: [Bendor1993]_


Surely there is an earlier description ...

I thought so too but I struggled to find it.

I'll put Axelrod's book in (it's what I did for Cooperator and Alternator). 👍

marcharper · 2017-06-06T00:36:20Z

We need to decide if any reference will do or if we are going to try to track down the original reference in all cases.

drvinceknight · 2017-06-06T05:51:02Z

We need to decide if any reference will do or if we are going to try to track down the original reference in all cases.
Merge state

What we've been doing so far is any description of the name in the literature. EDIT: We haven't been asking contributors to find the original source of a given strategy, simply list where they found it.

This will do for now and is an improvement over nothing.

drvinceknight · 2017-06-06T10:57:57Z

I've just added a few more. I'm missing a few of the ZD ones in axelrod/strategies/memory_one.py, would you be able to add those perhaps @marcharper? I'm going to probably finish off everything else by the end of today (nearly there now).

drvinceknight · 2017-06-06T11:03:14Z

would you be able to add those perhaps @marcharper?

If you have the time please push directly to this branch but no worries if not, I can circle back and hunt them down :) 👍

Currently missing: - Soft Joss. Soft Joss is GTFT with a different parameter. We need to find the literature with that particular parameter. Note that I've added a source [Torino2014] that lists SoftJoss as another name for GTFT and vice versa. - Also cannot find EXTORT-4

drvinceknight · 2017-06-06T19:14:49Z

After 383c488 there are two remaining strategies:

Soft Joss. Soft Joss is GTFT with a different parameter. We need to
find the literature with that particular parameter. Note that I've added
a source [Torino2014] that lists SoftJoss as another name for GTFT and
vice versa.
I cannot find EXTORT-4 (I've looked here: https://plato.stanford.edu/entries/prisoner-dilemma/)

FYI, the way I've gone about this PR is for any given strategy that was tricky:

google searching anything/everything related to the name
git blaming to have a guess at who implemented it
looking through git history of a file
reading papers that I think might be relevant.

marcharper · 2017-06-07T06:24:27Z

I'm trying to track it down. I suspect it's one with \Chi = 4 but I haven't found it yet. It's possible that I made this one up.

I have found some other concrete ZD examples in case we want to add more examples from the literature:

(11/13, 1/2, 7/26, 0) from Press and Dyson
ZDmischief (0.8, 0.6, 0.1, 0) an ZDextortion (0.64, 0.18, 0.28, 0) from this paper
There's a memory-two generalization in this paper on page 21 , as well as the memory-one (15/16, 1/2, 7/16, 1/16)
Looks like maybe one or two more in this paper PZDR (1.0, 0.35, 0.75, 0.1) (but looks like donation game matrix)
Some in this paper, see the caption for Fig 3

marcharper · 2017-06-07T06:29:59Z

Here's a source for "SOFT JOSS" (lecture notes). It's also implemented in PRISON.

Closes #225

drvinceknight · 2017-06-07T09:43:54Z

Here's a source for "SOFT JOSS" (lecture notes). It's also implemented in PRISON.

I wasn't quite satisfied with those lecture notes when I found them for some reason (not a valid one): have gone with Prison!

I suspect it's one with \Chi = 4 but I haven't found it yet. It's possible that I made this one up.

I think it is probably yours, I've gone with that anyway for now. We can always address at a later date :)

I have found some other concrete ZD examples

I'll copy those to #379 :)

If I'm not mistaken I think 9376619 now completes all the sources and closes #225 (assuming we're happy with the sources I've put in).

marcharper · 2017-06-07T10:50:14Z

axelrod/strategies/apavlov.py

+
+    Names:
+
+    - Adaptive Pavlov 2007: [Li2011]_


marcharper · 2017-06-07T10:52:21Z

axelrod/strategies/hunter.py

+
+    Names:
+
+    Defector Hunter: Original name by Marc Harper


These hunters are Karol I think except for cycle hunter and eventual cycle hunter

drvinceknight · 2017-06-07T11:10:49Z

I think I've caught all of those now @marcharper. Thanks for picking them up!

marcharper · 2017-06-07T11:17:58Z

axelrod/strategies/meta.py

+
+    Names
+
+    - Meta Hunter: Original name by Marc Harper


Meta Hunter Aggressive

Good catch. 9af08c2

marcharper

@meatballs please recheck

drvinceknight · 2017-06-07T16:44:29Z

Two very minor fixes in: ee77f4a 09b5994

drvinceknight · 2017-06-07T17:28:28Z

FYI Have added a couple more very little fixes (just minor details like year etc that I found whilst getting the bibtex for the moran paper).

meatballs · 2017-06-08T19:17:40Z

Is this finished and ready to be merged?

drvinceknight · 2017-06-08T20:30:09Z

Yes, assuming you're ok with it.

Add sources for some strategies.

609d27b

Ongoing work on #225

meatballs approved these changes Jun 5, 2017

View reviewed changes

marcharper reviewed Jun 6, 2017

View reviewed changes

drvinceknight added 2 commits June 6, 2017 07:02

Fix points raised by Marc.

421152a

Add ALLC and ALLD, Defector sources.

05dfbb4

drvinceknight force-pushed the 225 branch from 5ca84b4 to 124359a Compare June 6, 2017 19:03

drvinceknight force-pushed the 225 branch from 124359a to 383c488 Compare June 6, 2017 19:08

Add remaining strategy sources.

9376619

Closes #225

drvinceknight mentioned this pull request Jun 7, 2017

Desired New strategies #379

Open

marcharper reviewed Jun 7, 2017

View reviewed changes

axelrod/strategies/apavlov.py Outdated

Names:

- Adaptive Pavlov 2007: [Li2011]_

Copy link

Member

marcharper Jun 7, 2017

Choose a reason for hiding this comment

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

2011?

marcharper reviewed Jun 7, 2017

View reviewed changes

Fix errors caught by Marc.

16908bb

marcharper reviewed Jun 7, 2017

View reviewed changes

Fix meta hunter aggressive.

9af08c2

marcharper approved these changes Jun 7, 2017

View reviewed changes

drvinceknight added 2 commits June 7, 2017 17:24

Correct typo in bib key.

ee77f4a

Fix source for GTFT

09b5994

Fix broken bib key.

88a33ce

drvinceknight added 4 commits June 7, 2017 17:55

Update reference for handshake.

6bff664

Correct bib date/key.

1cb3187

Add more bib details for Kraines 1989.

4d62424

Fix convention for Names listing.

5a6caf3

Fix minor style conventions for Names.

a2a98f4

drvinceknight force-pushed the 225 branch from 67c9eba to a2a98f4 Compare June 7, 2017 17:44

meatballs merged commit 99d0e2e into master Jun 8, 2017

meatballs deleted the 225 branch June 8, 2017 22:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add sources for some strategies. #1041

Add sources for some strategies. #1041

drvinceknight commented Jun 5, 2017

marcharper Jun 6, 2017

drvinceknight Jun 6, 2017

marcharper Jun 6, 2017

drvinceknight Jun 6, 2017

drvinceknight Jun 6, 2017

marcharper commented Jun 6, 2017

drvinceknight commented Jun 6, 2017 •

edited

Loading

drvinceknight commented Jun 6, 2017

drvinceknight commented Jun 6, 2017

drvinceknight commented Jun 6, 2017

marcharper commented Jun 7, 2017

marcharper commented Jun 7, 2017

drvinceknight commented Jun 7, 2017

marcharper Jun 7, 2017

marcharper Jun 7, 2017

drvinceknight commented Jun 7, 2017

marcharper Jun 7, 2017

drvinceknight Jun 7, 2017

marcharper left a comment

drvinceknight commented Jun 7, 2017

drvinceknight commented Jun 7, 2017

meatballs commented Jun 8, 2017

drvinceknight commented Jun 8, 2017

Add sources for some strategies. #1041

Add sources for some strategies. #1041

Conversation

drvinceknight commented Jun 5, 2017

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 Jun 6, 2017

drvinceknight commented Jun 6, 2017 • edited Loading

drvinceknight commented Jun 6, 2017

drvinceknight commented Jun 6, 2017

drvinceknight commented Jun 6, 2017

marcharper commented Jun 7, 2017

marcharper commented Jun 7, 2017

drvinceknight commented Jun 7, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

drvinceknight commented Jun 7, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcharper left a comment

Choose a reason for hiding this comment

drvinceknight commented Jun 7, 2017

drvinceknight commented Jun 7, 2017

meatballs commented Jun 8, 2017

drvinceknight commented Jun 8, 2017

drvinceknight commented Jun 6, 2017 •

edited

Loading