Include some references and names for strategies. #741

Nikoleta-v3 · 2016-10-12T14:11:15Z

Part of issue 225.

Documentation for a few strategies. Including various names and author.

drvinceknight · 2016-10-12T14:12:19Z

axelrod/strategies/punisher.py

-    opponent has defected, but forgets after mem_length matches, with
-    1 <= mem_length <= 20 proportional to the amount of time the opponent
-    has played C. The inverse of Punisher.
+    An inverse player of Punisher.


This is not clearer than what was there. What do you mean by 'inverse'?

drvinceknight · 2016-10-12T14:12:53Z

axelrod/strategies/qlearner.py

+    """A player who learns the best strategies through the q-learning
+    algorithm.
+
+    Q-learning algorithm: http://www.cse.unsw.edu.au/~cs9417ml/RL1/algorithms.html


I don't think this is necessary here.

drvinceknight · 2016-10-12T14:15:10Z

axelrod/strategies/retaliate.py

+
+    Names:
+
+    - LimitedRetaliate3: Original strategy by Owen Campbell


Just pinging @meatballs to check that these (see above) where indeed his.

We confirmed it in PyCon. But I'll make sure to ping the author for now on.

We confirmed it in PyCon. But I'll make sure to ping the author for now on.

No that's cool, hadn't realised you had chatted :) 👍

drvinceknight · 2016-10-12T14:15:52Z

axelrod/strategies/titfortat.py

+
+    Names:
+
+    - Hard Tit For Tat:


drvinceknight · 2016-10-12T14:15:59Z

axelrod/strategies/titfortat.py

+
+    Names:
+
+    - Hard Tit For Two Tats:


I couldn't find all the Tit for Tat altered strategies reference. I believe some of the could be in the initial tournaments with different names. I need to further investigate these .

Cool. In those cases can you put:

- Hard Tit For Two Tats: Reference required.

It's still better to have the name clearly there for the case of people looking for it.

Although I think you can probably find Hard Tit For Two Tats in various papers.

You are correct. I am leaving 'Reference required' for now though.

drvinceknight · 2016-10-12T14:16:20Z

axelrod/strategies/titfortat.py

-    http://perso.uclouvain.be/vincent.blondel/workshops/2003/beaufils.pdf """
+    Names:
+
+    - Gradual: http://perso.uclouvain.be/vincent.blondel/workshops/2003/beaufils.pdf


Can you reference using the bibliography.

drvinceknight · 2016-10-12T14:17:07Z

docs/reference/bibliography.rst

@@ -18,3 +18,8 @@ documentation.
 .. [Stewart2012] Stewart, a. J., & Plotkin, J. B. (2012). Extortion and cooperation in the Prisoner’s Dilemma. Proceedings of the National Academy of Sciences, 109(26), 10134–10135. http://doi.org/10.1073/pnas.1208087109
 .. [Szabó1992] Szabó, G., & Fáth, G. (2007). Evolutionary games on graphs. Physics Reports, 446(4-6), 97–216. http://doi.org/10.1016/j.physrep.2007.04.004
 .. [Tzafestas2000] Tzafestas, E. (2000). Toward adaptive cooperative behavior. From Animals to Animals: Proceedings of the 6th International Conference on the Simulation of Adaptive Behavior {(SAB-2000)}, 2, 334–340.
+.. [Axelrod1984]  The Evolution of Cooperation. Basic Books. ISBN 0-465-02121-2.


Can you keep these in alphabetical order please.

drvinceknight · 2016-10-12T14:20:12Z

@Nikoleta-v3 also looks like this needs to be rebased on to current master.

…hue-Morse sequence. The strategies are original strategies writen by Gareint Palmer, thus this was added to the documentation. Also added a link of the Thue Morse sequence used by strategies. Finally, corrected the description a bit.

Random was a strategy initially used in the first tournament of Axelrod.

Added names and the fact that they are original created by O. Campbell.

Added a link to a q-algorithm site, also added the author because the strategies are original.

A lot are missing. I need to futher investigate the first strategies of Axelrod's tornament and if the match with different types of Tit for Tat.

These are original strategies from our contributors. Such as Geraint and Owen.

First paper to include random is that of Axelrod.

drvinceknight

Just a couple of minor things from me.

drvinceknight · 2016-10-12T15:48:15Z

axelrod/strategies/punisher.py

-    opponent has defected, but forgets after mem_length matches, with
-    1 <= mem_length <= 20 proportional to the amount of time the opponent
-    has played C. The inverse of Punisher.
+    An inverse player of Punisher. Similarly the player starts by cooperating however will defect if at any point the


I think this should be: "An inverted version of Punisher."

drvinceknight · 2016-10-12T15:48:46Z

axelrod/strategies/qlearner.py


-    This qlearner is quick to come to conclusions and doesn't care about the future.
+    - RiskyQLearner: Original strategy by Geraint Palmer


Risky Q Learner

(RiskyQLearner is the name of the class)

drvinceknight · 2016-10-12T15:48:59Z

axelrod/strategies/qlearner.py

+
+    Names:
+
+    - ArrogantQLearner: Original strategy by Geraint Palmer


Arrogant Q Learner

drvinceknight · 2016-10-12T15:49:11Z

axelrod/strategies/qlearner.py

+
+    Names:
+
+    - HesitantQLearner: Original strategy by Geraint Palmer


Hesitant Q Learner

drvinceknight · 2016-10-12T15:49:18Z

axelrod/strategies/qlearner.py

+
+    Names:
+
+    - CautiousQLearner: Original strategy by Geraint Palmer


Cautious Q Learner

drvinceknight · 2016-10-12T15:50:22Z

axelrod/strategies/titfortat.py

+
+    Names:
+
+    - Tit for two Tats: [Axelrod1984]_


"Two tits for Tat" I assume?

drvinceknight · 2016-10-12T15:51:09Z

axelrod/strategies/titfortat.py

@@ -148,7 +176,12 @@ def strategy(opponent):

 class AntiTitForTat(Player):
    """A strategy that plays the opposite of the opponents previous move.
-    This is similar to BULLY above, except that the first move is cooperation."""
+    This is similar to BULLY above, except that the first move is cooperation.


Can you get rid of "above" please, so:

This is similar to Bully, except that...

drvinceknight · 2016-10-12T15:52:07Z

docs/reference/bibliography.rst

@@ -7,14 +7,20 @@ This is a collection of various bibliographic items referenced in the
 documentation.

 .. [Axelrod1980] Axelrod, R. (1980). Effective Choice in the Prisoner’s Dilemma. Journal of Conflict Resolution, 24(1), 3–25.
+.. [Axelrod1984]  The Evolution of Cooperation. Basic Books. ISBN 0-465-02121-2.
+.. [Axelrod1995] Wu, J. and Axelrod, R. (1995) ‘How to cope with noise in the Iterated prisoner’s dilemma’, Journal of Conflict Resolution, 39(1), pp. 183–189. doi: 10.1177/0022002795039001008.


No need for the '

drvinceknight · 2016-10-12T15:52:29Z

docs/reference/bibliography.rst

 .. [Banks1980] Banks, J. S., & Sundaram, R. K. (1990). Repeated games, finite automata, and complexity. Games and Economic Behavior, 2(2), 97–117.  http://doi.org/10.1016/0899-8256(90)90024-O
+.. [Beaufils1997] Beaufils, B. and Delahaye, J. (1997) ‘Our Meeting With Gradual: A Good Strategy For The Iterated Prisoner’s Dilemma’. http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.42.4041


Same comment.

drvinceknight · 2016-10-12T15:52:37Z

docs/reference/bibliography.rst

 .. [Berg2015] Berg, P. Van Den, & Weissing, F. J. (2015). The importance of mechanisms for the evolution of cooperation. Proceedings of the Royal Society B-Biological Sciences, 282.
+.. [Hilde2013] Hilbe, C., Nowak, M.A. and Traulsen, A. (2013) ‘Adaptive dynamics of extortion and compliance’, PLoS ONE, 8(11), p. e77886. doi: 10.1371/journal.pone.0077886.


Same comment.

I was getting an error because of the line space.

Making sure ":" is after name and '-' space before name.

Gradual's paper has been added to bibliography.

Nikoleta-v3 · 2016-10-12T17:17:19Z

@drvinceknight I believe I addressed all your comments. I also did rebase. Waiting for further comments from @meatballs 😄

drvinceknight · 2016-10-13T06:42:39Z

This is fine by me. I've edited the name of the PR so that it's verbose.

meatballs · 2016-10-13T10:46:58Z

axelrod/strategies/punisher.py

-    1 <= mem_length <= 20 proportional to the amount of time the opponent
-    has played C. The inverse of Punisher.
+    An inverted version of Punisher. Similarly the player starts by cooperating however will defect if at any point the
+    opponent has defected, but forgets after mem_length matches, with 1 <= mem_length <= 20. This time mem_lenght is


typo: 'mem_lenght' should be 'mem_length'

meatballs · 2016-10-13T10:47:44Z

axelrod/strategies/qlearner.py

@@ -109,9 +115,14 @@ def reset(self):


 class ArrogantQLearner(RiskyQLearner):
-    """A player who learns the best strategies through the q-learning algorithm.
+    """A player who learns the best strategies through the q-learning
+    algorithm.

    This Q learner jumps to quick conclusions and care about the future.


typo: 'care' should be 'cares'

meatballs · 2016-10-13T10:50:27Z

axelrod/strategies/titfortat.py

@@ -84,7 +96,13 @@ class Bully(Player):
    """A player that behaves opposite to Tit For Tat, including first move.

    Starts by defecting and then does the opposite of opponent's previous move.
-    This is the complete opposite of TIT FOR TAT, also called BULLY in literature.
+    This is the complete opposite of Tit For Tat, also called BULLY in
+    literature.


typo: should be 'in THE literature'

meatballs · 2016-10-13T10:50:57Z

axelrod/strategies/titfortat.py

@@ -128,7 +151,12 @@ def strategy(self, opponent):


 class SuspiciousTitForTat(Player):
-    """A TFT that initially defects."""
+    """A variant of Tit For Tats that starts off with a defection.


typo: 'Tats' should be 'Tat'

All done @meatballs 😄

drvinceknight requested changes Oct 12, 2016

View reviewed changes

Nikoleta-v3 added 8 commits October 12, 2016 16:52

Adding citation and name in random.

e4d5579

Random was a strategy initially used in the first tournament of Axelrod.

Fixing documentation of Retaliate family.

ad2f2a5

Added names and the fact that they are original created by O. Campbell.

Adding the author of the strategies individually.

cdd32f9

Fixing documentation of the QLeaner strategies.

45e082a

Added a link to a q-algorithm site, also added the author because the strategies are original.

Documentation for Tit for Tat strategies.

68c6f0f

A lot are missing. I need to futher investigate the first strategies of Axelrod's tornament and if the match with different types of Tit for Tat.

Documentation for list of strategies.

4a50bb4

These are original strategies from our contributors. Such as Geraint and Owen.

Simple reference for random.

1781fa4

First paper to include random is that of Axelrod.

drvinceknight requested changes Oct 12, 2016

View reviewed changes

Nikoleta-v3 added 9 commits October 12, 2016 16:56

Sorting issues with bibliography

38ce46a

Putting '==' back.

0a51048

Fixing the documentation of OmegaTFT.

28c2c2b

I was getting an error because of the line space.

Syntax corrections.

589dd62

Making sure ":" is after name and '-' space before name.

Correcting documentation for Punisher.

a5bf8df

Corrections to Q learner.

709ba72

Bibliography in alphabetic order.

b481f40

Refence Required as comment. Gradual citation.

0859fe3

Gradual's paper has been added to bibliography.

Vince Corrections v2

2e656a1

Nikoleta-v3 added 2 commits October 12, 2016 20:56

Thue Morse Inverse.

595afca

Inverse Thue Morse.

a145613

drvinceknight approved these changes Oct 13, 2016

View reviewed changes

drvinceknight added the ready-to-merge label Oct 13, 2016

drvinceknight changed the title ~~225~~ Include some references and names for strategies. Oct 13, 2016

meatballs requested changes Oct 13, 2016

View reviewed changes

Correcting typos pointed by @meatballs.

2c0ee46

meatballs approved these changes Oct 13, 2016

View reviewed changes

meatballs merged commit dcb0333 into Axelrod-Python:master Oct 13, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Include some references and names for strategies. #741

Include some references and names for strategies. #741

Nikoleta-v3 commented Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

Nikoleta-v3 Oct 12, 2016

meatballs Oct 12, 2016

drvinceknight Oct 12, 2016

Nikoleta-v3 Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

Nikoleta-v3 Oct 12, 2016

drvinceknight Oct 12, 2016

Nikoleta-v3 Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight commented Oct 12, 2016

drvinceknight left a comment

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

drvinceknight Oct 12, 2016

Nikoleta-v3 commented Oct 12, 2016

drvinceknight commented Oct 13, 2016

meatballs Oct 13, 2016

meatballs Oct 13, 2016

meatballs Oct 13, 2016

meatballs Oct 13, 2016

Nikoleta-v3 Oct 13, 2016


		Names:

		- LimitedRetaliate3: Original strategy by Owen Campbell


		This qlearner is quick to come to conclusions and doesn't care about the future.
		- RiskyQLearner: Original strategy by Geraint Palmer


		Names:

		- ArrogantQLearner: Original strategy by Geraint Palmer


		Names:

		- HesitantQLearner: Original strategy by Geraint Palmer


		Names:

		- CautiousQLearner: Original strategy by Geraint Palmer

		.. [Banks1980] Banks, J. S., & Sundaram, R. K. (1990). Repeated games, finite automata, and complexity. Games and Economic Behavior, 2(2), 97–117. http://doi.org/10.1016/0899-8256(90)90024-O
		.. [Beaufils1997] Beaufils, B. and Delahaye, J. (1997) ‘Our Meeting With Gradual: A Good Strategy For The Iterated Prisoner’s Dilemma’. http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.42.4041

		.. [Berg2015] Berg, P. Van Den, & Weissing, F. J. (2015). The importance of mechanisms for the evolution of cooperation. Proceedings of the Royal Society B-Biological Sciences, 282.
		.. [Hilde2013] Hilbe, C., Nowak, M.A. and Traulsen, A. (2013) ‘Adaptive dynamics of extortion and compliance’, PLoS ONE, 8(11), p. e77886. doi: 10.1371/journal.pone.0077886.

Include some references and names for strategies. #741

Include some references and names for strategies. #741

Conversation

Nikoleta-v3 commented Oct 12, 2016

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

drvinceknight commented Oct 12, 2016

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

Nikoleta-v3 commented Oct 12, 2016

drvinceknight commented Oct 13, 2016

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