Skip to content

Commit deb7bad

Browse files
authored
Merge pull request #739 from mturzanska/per_cccdcd
Implement per_cccdcd strategy from PRISON project
2 parents 0566346 + f827273 commit deb7bad

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

axelrod/strategies/_strategies.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from .cooperator import Cooperator, TrickyCooperator
1414
from .cycler import (
1515
AntiCycler, Cycler, CyclerCCD, CyclerCCCD, CyclerCCCCCD,
16-
CyclerDC, CyclerDDC)
16+
CyclerDC, CyclerDDC, CyclerCCCDCD)
1717
from .darwin import Darwin
1818
from .defector import Defector, TrickyDefector
1919
from .finite_state_machines import (
@@ -91,6 +91,7 @@
9191
CyclerCCD,
9292
CyclerDC,
9393
CyclerDDC,
94+
CyclerCCCDCD,
9495
Darwin,
9596
Davis,
9697
Defector,

axelrod/strategies/cycler.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,14 @@ class CyclerCCCCCD(Cycler):
130130
@init_args
131131
def __init__(self, cycle="CCCCCD"):
132132
Cycler.__init__(self, cycle=cycle)
133+
134+
135+
class CyclerCCCDCD(Cycler):
136+
137+
name = 'Cycler CCCDCD'
138+
classifier = copy.copy(Cycler.classifier)
139+
classifier['memory_depth'] = 5
140+
141+
@init_args
142+
def __init__(self, cycle="CCCDCD"):
143+
Cycler.__init__(self, cycle=cycle)

axelrod/tests/unit/test_cycler.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,4 @@ def test_strategy(self):
5757
TestCyclerDDC = test_cycler_factory("DDC")
5858
TestCyclerCCCD = test_cycler_factory("CCCD")
5959
TestCyclerCCCCCD = test_cycler_factory("CCCCCD")
60+
TestCyclerCCCDCD = test_cycler_factory("CCCDCD")

0 commit comments

Comments
 (0)