Merge pull request #1275 from Axelrod-Python/fix-first-tournament-second-tournament-confusion

Re factor/implement first tournament strategies

Author: meatballs

axelrod/strategies/__init__.py

@@ -63,6 +63,23 @@
 # Distinguished strategy collections in addition to
 # `all_strategies` from _strategies.py
 demo_strategies = [Cooperator, Defector, TitForTat, Grudger, Random]
+axelrod_first_strategies = [
+            TitForTat,
+            FirstByTidemanAndChieruzzi,
+            FirstByNydegger,
+            FirstByGrofman,
+            FirstByShubik,
+            FirstBySteinAndRapoport,
+            Grudger,
+            FirstByDavis,
+            FirstByGraaskamp,
+            FirstByDowning,
+            FirstByFeld,
+            FirstByJoss,
+            FirstByTullock,
+            FirstByAnonymous,
+            Random,
+        ]
 basic_strategies = [s for s in all_strategies if is_basic(s())]
 strategies = [s for s in all_strategies if obey_axelrod(s())]
 

axelrod/strategies/_strategies.py

@@ -6,44 +6,44 @@
 from .appeaser import Appeaser
 from .averagecopier import AverageCopier, NiceAverageCopier
 from .axelrod_first import (
-    Davis,
-    Feld,
-    Graaskamp,
-    Grofman,
-    Joss,
-    Nydegger,
-    RevisedDowning,
-    Shubik,
-    SteinAndRapoport,
-    TidemanAndChieruzzi,
-    Tullock,
-    UnnamedStrategy,
+    FirstByDavis,
+    FirstByFeld,
+    FirstByGraaskamp,
+    FirstByGrofman,
+    FirstByJoss,
+    FirstByNydegger,
+    FirstByDowning,
+    FirstByShubik,
+    FirstBySteinAndRapoport,
+    FirstByTidemanAndChieruzzi,
+    FirstByTullock,
+    FirstByAnonymous,
 )
 from .axelrod_second import (
-    Appold,
-    Black,
-    Borufsen,
-    Cave,
-    Champion,
-    Colbert,
-    Eatherley,
-    Getzler,
-    Gladstein,
-    GraaskampKatzen,
-    Harrington,
-    Kluepfel,
-    Leyvraz,
-    Mikkelson,
-    MoreGrofman,
-    MoreTidemanAndChieruzzi,
-    RichardHufford,
-    Rowsam,
-    Tester,
-    Tranquilizer,
-    Weiner,
-    White,
-    WmAdams,
-    Yamachi,
+    SecondByAppold,
+    SecondByBlack,
+    SecondByBorufsen,
+    SecondByCave,
+    SecondByChampion,
+    SecondByColbert,
+    SecondByEatherley,
+    SecondByGetzler,
+    SecondByGladstein,
+    SecondByGraaskampKatzen,
+    SecondByHarrington,
+    SecondByKluepfel,
+    SecondByLeyvraz,
+    SecondByMikkelson,
+    SecondByGrofman,
+    SecondByTidemanAndChieruzzi,
+    SecondByRichardHufford,
+    SecondByRowsam,
+    SecondByTester,
+    SecondByTranquilizer,
+    SecondByWeiner,
+    SecondByWhite,
+    SecondByWmAdams,
+    SecondByYamachi,
 )
 from .backstabber import BackStabber, DoubleCrosser
 from .better_and_better import BetterAndBetter
@@ -189,6 +189,7 @@
     Retaliate2,
     Retaliate3,
 )
+from .revised_downing import RevisedDowning
 from .selfsteem import SelfSteem
 from .sequence_player import SequencePlayer, ThueMorse, ThueMorseInverse
 from .shortmem import ShortMem
@@ -254,20 +255,20 @@
     APavlov2006,
     APavlov2011,
     Appeaser,
-    Appold,
+    SecondByAppold,
     ArrogantQLearner,
     AverageCopier,
     BackStabber,
     BetterAndBetter,
-    Black,
-    Borufsen,
+    SecondByBlack,
+    SecondByBorufsen,
     Bully,
     BushMosteller,
     Calculator,
     CautiousQLearner,
-    Cave,
-    Champion,
-    Colbert,
+    SecondByCave,
+    SecondByChampion,
+    SecondByColbert,
     CollectiveStrategy,
     ContriteTitForTat,
     Cooperator,
@@ -280,7 +281,8 @@
     CyclerDDC,
     CyclerCCCDCD,
     Darwin,
-    Davis,
+    FirstByDavis,
+    FirstByAnonymous,
     DBS,
     Defector,
     DefectorHunter,
@@ -291,7 +293,7 @@
     Doubler,
     DoubleResurrection,
     EasyGo,
-    Eatherley,
+    SecondByEatherley,
     EugineNier,
     EventualCycleHunter,
     EvolvedANN,
@@ -303,7 +305,7 @@
     EvolvedLookerUp1_1_1,
     EvolvedLookerUp2_2_2,
     EvolvedHMM5,
-    Feld,
+    FirstByFeld,
     FirmButFair,
     FoolMeOnce,
     ForgetfulFoolMeOnce,
@@ -317,19 +319,19 @@
     GellerCooperator,
     GellerDefector,
     GeneralSoftGrudger,
-    Getzler,
-    Gladstein,
+    SecondByGetzler,
+    SecondByGladstein,
     GoByMajority,
     GoByMajority10,
     GoByMajority20,
     GoByMajority40,
     GoByMajority5,
     Golden,
-    Graaskamp,
-    GraaskampKatzen,
+    FirstByGraaskamp,
+    SecondByGraaskampKatzen,
     Gradual,
     GradualKiller,
-    Grofman,
+    FirstByGrofman,
     Grudger,
     GrudgerAlternator,
     Grumpy,
@@ -342,35 +344,36 @@
     HardProber,
     HardTitFor2Tats,
     HardTitForTat,
-    Harrington,
+    SecondByHarrington,
     HesitantQLearner,
     Hopeless,
     Inverse,
     InversePunisher,
-    Joss,
-    Kluepfel,
+    FirstByJoss,
+    SecondByKluepfel,
     KnowledgeableWorseAndWorse,
     LevelPunisher,
-    Leyvraz,
+    SecondByLeyvraz,
     LimitedRetaliate,
     LimitedRetaliate2,
     LimitedRetaliate3,
     MathConstantHunter,
     NaiveProber,
     MEM2,
     Michaelos,
-    Mikkelson,
+    SecondByMikkelson,
     MindBender,
     MindController,
     MindReader,
     MindWarper,
     MirrorMindReader,
-    MoreGrofman,
-    MoreTidemanAndChieruzzi,
+    RevisedDowning,
+    SecondByGrofman,
+    SecondByTidemanAndChieruzzi,
     Negation,
     NiceAverageCopier,
     NTitsForMTats,
-    Nydegger,
+    FirstByNydegger,
     OmegaTFT,
     OnceBitten,
     OppositeGrudger,
@@ -396,14 +399,14 @@
     Retaliate,
     Retaliate2,
     Retaliate3,
-    RevisedDowning,
-    RichardHufford,
+    FirstByDowning,
+    SecondByRichardHufford,
     Ripoff,
     RiskyQLearner,
-    Rowsam,
+    SecondByRowsam,
     SelfSteem,
     ShortMem,
-    Shubik,
+    FirstByShubik,
     SlowTitForTwoTats2,
     SneakyTitForTat,
     SoftGrudger,
@@ -412,41 +415,41 @@
     SolutionB5,
     SpitefulTitForTat,
     Stalker,
-    SteinAndRapoport,
+    FirstBySteinAndRapoport,
     StochasticCooperator,
     StochasticWSLS,
     SuspiciousTitForTat,
-    Tester,
+    SecondByTester,
     TF1,
     TF2,
     TF3,
     ThueMorse,
     ThueMorseInverse,
     Thumper,
-    TidemanAndChieruzzi,
+    FirstByTidemanAndChieruzzi,
     TitForTat,
     TitFor2Tats,
-    Tranquilizer,
+    SecondByTranquilizer,
     TrickyCooperator,
     TrickyDefector,
     TrickyLevelPunisher,
-    Tullock,
+    FirstByTullock,
     TwoTitsForTat,
     UsuallyCooperates,
     UsuallyDefects,
     VeryBad,
-    Weiner,
-    White,
+    SecondByWeiner,
+    SecondByWhite,
     Willing,
     Winner12,
     Winner21,
     WinShiftLoseStay,
     WinStayLoseShift,
-    WmAdams,
+    SecondByWmAdams,
     WorseAndWorse,
     WorseAndWorse2,
     WorseAndWorse3,
-    Yamachi,
+    SecondByYamachi,
     ZDExtortion,
     ZDExtort2,
     ZDExtort3,