Add Original Gradual to the list of all strategies.

axelrod/strategies/_strategies.py

@@ -241,73 +241,76 @@
 
 
 all_strategies = [
+    ALLCorALLD,
+    AON2,
+    APavlov2006,
+    APavlov2011,
     Adaptive,
     AdaptiveTitForTat,
     AdaptorBrief,
     AdaptorLong,
     Aggravater,
     Alexei,
-    ALLCorALLD,
     Alternator,
     AlternatorHunter,
     AntiCycler,
     AntiTitForTat,
-    AON2,
-    APavlov2006,
-    APavlov2011,
     Appeaser,
-    SecondByAppold,
     ArrogantQLearner,
     AverageCopier,
     BackStabber,
     BetterAndBetter,
-    SecondByBlack,
-    SecondByBorufsen,
     Bully,
     BushMosteller,
     Calculator,
     CautiousQLearner,
-    SecondByCave,
-    SecondByChampion,
-    SecondByColbert,
     CollectiveStrategy,
     ContriteTitForTat,
     Cooperator,
     CooperatorHunter,
     CycleHunter,
     CyclerCCCCCD,
     CyclerCCCD,
+    CyclerCCCDCD,
     CyclerCCD,
     CyclerDC,
     CyclerDDC,
-    CyclerCCCDCD,
-    Darwin,
-    FirstByDavis,
-    FirstByAnonymous,
     DBS,
+    Darwin,
     Defector,
     DefectorHunter,
-    Desperate,
     DelayedAON1,
+    Desperate,
     Detective,
     DoubleCrosser,
-    Doubler,
     DoubleResurrection,
+    Doubler,
+    DynamicTwoTitsForTat,
     EasyGo,
-    SecondByEatherley,
     EugineNier,
     EventualCycleHunter,
     EvolvedANN,
     EvolvedANN5,
     EvolvedANNNoise05,
-    EvolvedFSM4,
     EvolvedFSM16,
     EvolvedFSM16Noise05,
+    EvolvedFSM4,
+    EvolvedHMM5,
     EvolvedLookerUp1_1_1,
     EvolvedLookerUp2_2_2,
-    EvolvedHMM5,
-    FirstByFeld,
     FirmButFair,
+    FirstByAnonymous,
+    FirstByDavis,
+    FirstByDowning,
+    FirstByFeld,
+    FirstByGraaskamp,
+    FirstByGrofman,
+    FirstByJoss,
+    FirstByNydegger,
+    FirstByShubik,
+    FirstBySteinAndRapoport,
+    FirstByTidemanAndChieruzzi,
+    FirstByTullock,
     FoolMeOnce,
     ForgetfulFoolMeOnce,
     ForgetfulGrudger,
@@ -320,19 +323,14 @@
     GellerCooperator,
     GellerDefector,
     GeneralSoftGrudger,
-    SecondByGetzler,
-    SecondByGladstein,
     GoByMajority,
     GoByMajority10,
     GoByMajority20,
     GoByMajority40,
     GoByMajority5,
     Golden,
-    FirstByGraaskamp,
-    SecondByGraaskampKatzen,
     Gradual,
     GradualKiller,
-    FirstByGrofman,
     Grudger,
     GrudgerAlternator,
     Grumpy,
@@ -345,39 +343,35 @@
     HardProber,
     HardTitFor2Tats,
     HardTitForTat,
-    SecondByHarrington,
     HesitantQLearner,
     Hopeless,
     Inverse,
     InversePunisher,
-    FirstByJoss,
-    SecondByKluepfel,
     KnowledgeableWorseAndWorse,
     LevelPunisher,
-    SecondByLeyvraz,
     LimitedRetaliate,
     LimitedRetaliate2,
     LimitedRetaliate3,
-    MathConstantHunter,
-    NaiveProber,
     MEM2,
+    MathConstantHunter,
     Michaelos,
-    SecondByMikkelson,
     MindBender,
     MindController,
     MindReader,
     MindWarper,
     MirrorMindReader,
-    RevisedDowning,
-    SecondByGrofman,
-    SecondByTidemanAndChieruzzi,
+    NTitsForMTats,
+    NaiveProber,
     Negation,
     NiceAverageCopier,
-    NTitsForMTats,
-    FirstByNydegger,
     OmegaTFT,
     OnceBitten,
     OppositeGrudger,
+    OriginalGradual,
+    PSOGambler1_1_1,
+    PSOGambler2_2_2,
+    PSOGambler2_2_2_Noise05,
+    PSOGamblerMem1,
     Pi,
     Predator,
     Prober,
@@ -386,10 +380,6 @@
     Prober4,
     ProtectedMindReader,
     Pun1,
-    PSOGambler1_1_1,
-    PSOGambler2_2_2,
-    PSOGambler2_2_2_Noise05,
-    PSOGamblerMem1,
     Punisher,
     Raider,
     Random,
@@ -400,14 +390,35 @@
     Retaliate,
     Retaliate2,
     Retaliate3,
-    FirstByDowning,
-    SecondByRichardHufford,
+    RevisedDowning,
     Ripoff,
     RiskyQLearner,
+    SecondByAppold,
+    SecondByBlack,
+    SecondByBorufsen,
+    SecondByCave,
+    SecondByChampion,
+    SecondByColbert,
+    SecondByEatherley,
+    SecondByGetzler,
+    SecondByGladstein,
+    SecondByGraaskampKatzen,
+    SecondByGrofman,
+    SecondByHarrington,
+    SecondByKluepfel,
+    SecondByLeyvraz,
+    SecondByMikkelson,
+    SecondByRichardHufford,
     SecondByRowsam,
+    SecondByTester,
+    SecondByTidemanAndChieruzzi,
+    SecondByTranquilizer,
+    SecondByWeiner,
+    SecondByWhite,
+    SecondByWmAdams,
+    SecondByYamachi,
     SelfSteem,
     ShortMem,
-    FirstByShubik,
     SlowTitForTwoTats2,
     SneakyTitForTat,
     SoftGrudger,
@@ -416,51 +427,41 @@
     SolutionB5,
     SpitefulTitForTat,
     Stalker,
-    FirstBySteinAndRapoport,
     StochasticCooperator,
     StochasticWSLS,
     SuspiciousTitForTat,
-    SecondByTester,
     TF1,
     TF2,
     TF3,
     ThueMorse,
     ThueMorseInverse,
     Thumper,
-    FirstByTidemanAndChieruzzi,
-    TitForTat,
     TitFor2Tats,
-    SecondByTranquilizer,
+    TitForTat,
     TrickyCooperator,
     TrickyDefector,
     TrickyLevelPunisher,
-    FirstByTullock,
     TwoTitsForTat,
     UsuallyCooperates,
     UsuallyDefects,
     VeryBad,
-    SecondByWeiner,
-    SecondByWhite,
     Willing,
-    Winner12,
-    Winner21,
     WinShiftLoseStay,
     WinStayLoseShift,
-    SecondByWmAdams,
+    Winner12,
+    Winner21,
     WorseAndWorse,
     WorseAndWorse2,
     WorseAndWorse3,
-    SecondByYamachi,
-    ZDExtortion,
     ZDExtort2,
-    ZDExtort3,
     ZDExtort2v2,
+    ZDExtort3,
     ZDExtort4,
+    ZDExtortion,
     ZDGTFT2,
     ZDGen2,
     ZDMem2,
     ZDMischief,
     ZDSet2,
     e,
-    DynamicTwoTitsForTat,
 ]

axelrod/tests/strategies/test_meta.py

@@ -347,7 +347,7 @@ class TestMetaMajorityMemoryOne(TestMetaPlayer):
     }
 
     def test_strategy(self):
-        actions = [(C, C), (C, D), (C, C), (C, D), (D, C)]
+        actions = [(C, C), (C, D), (D, C), (C, D), (D, C)]
         self.versus_test(opponent=axl.Alternator(), expected_actions=actions)
 
 
@@ -422,7 +422,7 @@ class TestMetaWinnerFiniteMemory(TestMetaPlayer):
     }
 
     def test_strategy(self):
-        actions = [(C, C), (C, D), (C, C), (C, D), (D, C)]
+        actions = [(C, C), (C, D), (C, C), (D, D), (D, C)]
         self.versus_test(opponent=axl.Alternator(), expected_actions=actions)
 
 
@@ -568,7 +568,7 @@ class TestNMWEStochastic(TestMetaPlayer):
     }
 
     def test_strategy(self):
-        actions = [(C, C), (C, D), (C, C), (C, D), (D, C)]
+        actions = [(C, C), (C, D), (D, C), (C, D), (D, C)]
         self.versus_test(opponent=axl.Alternator(), expected_actions=actions, seed=20)