Add Neg strategy and change 4 method names for consistency #748

amkratz · 2016-10-23T07:52:04Z

Related to #379

Added Neg strategy Added Neg tests Updated _Strategies.py and all_strategies.rst to include Neg

Changed 4 instances of method name test_affect_of_strategy() to test_effect_of_strategy() for consistency

meatballs · 2016-10-23T09:22:41Z

axelrod/strategies/neg.py

+    def strategy(self, opponent):
+        # Random first move
+        if(len(self.history) == 0):
+            return random_choice();


This would be better as:

if not self.history:

meatballs · 2016-10-23T09:24:53Z

axelrod/strategies/_strategies.py

@@ -46,6 +46,7 @@
 from .mindcontrol import MindController, MindWarper, MindBender
 from .mindreader import MindReader, ProtectedMindReader, MirrorMindReader
 from .mutual import Desperate, Hopeless, Willing
+from .neg import Neg
 from .oncebitten import OnceBitten, FoolMeOnce, ForgetfulFoolMeOnce, FoolMeForever


The strategy also needs to be added to the all_strategies list in this file

meatballs · 2016-10-23T09:26:20Z

Thanks for the contribution @amkratz ! Just a couple of minor change requests from me.

marcharper

A few minor changes from me. Let's change the strategy names (and class names) to use Negation.

marcharper · 2016-10-23T17:10:03Z

axelrod/strategies/neg.py

+
+    Names:
+
+    Neg - [No official reference found in docs, only found in 'Desired New Strategies' list: https://github.com/Axelrod-Python/Axelrod/issues/379]


Please list this as the reference: http://www.prisoners-dilemma.com/competition.html

Note that the full strategy name is Negation, and we should use that as the class name.

marcharper · 2016-10-23T17:10:10Z

axelrod/strategies/neg.py

+    Neg - [No official reference found in docs, only found in 'Desired New Strategies' list: https://github.com/Axelrod-Python/Axelrod/issues/379]
+    """
+
+    name = "Neg"


marcharper · 2016-10-23T17:10:43Z

axelrod/strategies/neg.py

+
+    name = "Neg"
+    classifier = {
+        'memory_depth': 1,  # Four-Vector = (1.,0.,1.,0.)


The memory depth is correct but not the Four-Vector comment, so let's leave that off.

marcharper · 2016-10-23T17:11:23Z

axelrod/strategies/neg.py

+    name = "Neg"
+    classifier = {
+        'memory_depth': 1,  # Four-Vector = (1.,0.,1.,0.)
+        'stochastic': False,


It is stochastic (first move is random).

Changed Neg to Negation Changed first move line and removed unnecessary comment Updated reference in Negation.py Updated list of all strategies in _strategies.py

Missing change from Neg to Negation in _strategies.py

amkratz · 2016-10-23T21:12:16Z

Thank you for the help, I went ahead and made those changes listed. Sorry if this pull request is kind of messy, it's my first time submitting one.

Doubler was added before and I didn't see it before I commited my updated files, so now I'm updating to include the doubler changes in hopes to correct the issue.

# Conflicts: # axelrod/strategies/_strategies.py # axelrod/strategies/doubler.py # axelrod/tests/unit/test_doubler.py # docs/reference/all_strategies.rst

Improper syntax was added to _strategies.py while I was trying to fix my repo. Hopefully this solves that issue.

Adjusted improper syntax in files that was added when trying to fix my repo

marcharper · 2016-10-24T03:28:24Z

Sorry if this pull request is kind of messy, it's my first time submitting one.

Not at all! It's quite good for a first PR on the project and we usually have at least a few minor comments with names and such. Thanks for the contribution!

marcharper · 2016-10-24T03:32:40Z

Looks like a few doc tests are failing now that we've marked the strategy as stochastic. You just need to manually edit the appropriate numbers in the documentation:

File "./docs/tutorials/advanced/classification_of_strategies.rst", line 49, in classification_of_strategies.rst

Failed example:
    len(strategies)
Expected:
    37
Got:
    38

----------------------------------------------------------------------

File "./docs/tutorials/advanced/classification_of_strategies.rst", line 60, in classification_of_strategies.rst

Failed example:
    len(strategies)
Expected:
    24
Got:
    25

----------------------------------------------------------------------

File "./docs/tutorials/advanced/classification_of_strategies.rst", line 72, in classification_of_strategies.rst

Failed example:
    len(strategies)
Expected:
    41
Got:
    42

This will get the tests working on Travis. @meatballs @drvinceknight 👍 from me once the tests pass!

amkratz · 2016-10-24T06:56:19Z

Everything seems to be in order now, I appreciate the comments. I hope to tackle a few more new strategies soon!

meatballs · 2016-10-24T07:22:23Z

Thanks @amkratz !!

amkratz added 2 commits October 23, 2016 00:49

Add Neg Strategy

c612967

Added Neg strategy Added Neg tests Updated _Strategies.py and all_strategies.rst to include Neg

Minor spelling changes

564b179

Changed 4 instances of method name test_affect_of_strategy() to test_effect_of_strategy() for consistency

amkratz changed the title ~~Add Neg Strategy~~ Add Neg strategy and change 4 method names for consistency Oct 23, 2016

meatballs requested changes Oct 23, 2016

View reviewed changes

marcharper requested changes Oct 23, 2016

View reviewed changes

amkratz added 2 commits October 23, 2016 14:06

Change Neg to Negation, reference changes

b238fc8

Changed Neg to Negation Changed first move line and removed unnecessary comment Updated reference in Negation.py Updated list of all strategies in _strategies.py

Forgot one name update

4e44164

Missing change from Neg to Negation in _strategies.py

amkratz added 5 commits October 23, 2016 15:34

Removed a comment

d52c396

Changed files to include Doubler

3dffcfb

Doubler was added before and I didn't see it before I commited my updated files, so now I'm updating to include the doubler changes in hopes to correct the issue.

Merge remote-tracking branch 'refs/remotes/Axelrod-Python/master'

03a0cd0

# Conflicts: # axelrod/strategies/_strategies.py # axelrod/strategies/doubler.py # axelrod/tests/unit/test_doubler.py # docs/reference/all_strategies.rst

Cotinuing to fix repo issues

7e3de73

Improper syntax was added to _strategies.py while I was trying to fix my repo. Hopefully this solves that issue.

Last of fixes to files

9bf2a22

Adjusted improper syntax in files that was added when trying to fix my repo

marcharper approved these changes Oct 24, 2016

View reviewed changes

marcharper added ready-to-merge and removed ready-to-merge labels Oct 24, 2016

Update classification_of_strategies.rst

4c27334

meatballs approved these changes Oct 24, 2016

View reviewed changes

meatballs merged commit 6da9308 into Axelrod-Python:master Oct 24, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Neg strategy and change 4 method names for consistency #748

Add Neg strategy and change 4 method names for consistency #748

amkratz commented Oct 23, 2016 •

edited

Loading

meatballs Oct 23, 2016

meatballs Oct 23, 2016

meatballs commented Oct 23, 2016

marcharper left a comment

marcharper Oct 23, 2016

marcharper Oct 23, 2016

marcharper Oct 23, 2016

marcharper Oct 23, 2016

amkratz commented Oct 23, 2016

marcharper commented Oct 24, 2016

marcharper commented Oct 24, 2016

amkratz commented Oct 24, 2016

meatballs commented Oct 24, 2016


		Names:

		Neg - [No official reference found in docs, only found in 'Desired New Strategies' list: https://github.com/Axelrod-Python/Axelrod/issues/379]

Add Neg strategy and change 4 method names for consistency #748

Add Neg strategy and change 4 method names for consistency #748

Conversation

amkratz commented Oct 23, 2016 • edited Loading

meatballs Oct 23, 2016

Choose a reason for hiding this comment

meatballs Oct 23, 2016

Choose a reason for hiding this comment

meatballs commented Oct 23, 2016

marcharper left a comment

Choose a reason for hiding this comment

marcharper Oct 23, 2016

Choose a reason for hiding this comment

marcharper Oct 23, 2016

Choose a reason for hiding this comment

marcharper Oct 23, 2016

Choose a reason for hiding this comment

marcharper Oct 23, 2016

Choose a reason for hiding this comment

amkratz commented Oct 23, 2016

marcharper commented Oct 24, 2016

marcharper commented Oct 24, 2016

amkratz commented Oct 24, 2016

meatballs commented Oct 24, 2016

amkratz commented Oct 23, 2016 •

edited

Loading