Skip to content

Commit 7520eec

Browse files
committed
Rename second tournament strategies to SecondBy
Happy to change the prefix etc...
1 parent c669a93 commit 7520eec

File tree

5 files changed

+177
-171
lines changed

5 files changed

+177
-171
lines changed

axelrod/strategies/_strategies.py

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,30 @@
2020
UnnamedStrategy,
2121
)
2222
from .axelrod_second import (
23-
Appold,
24-
Black,
25-
Borufsen,
26-
Cave,
27-
Champion,
28-
Colbert,
29-
Eatherley,
30-
Getzler,
31-
Gladstein,
32-
GraaskampKatzen,
33-
Harrington,
34-
Kluepfel,
35-
Leyvraz,
36-
Mikkelson,
37-
MoreGrofman,
38-
MoreTidemanAndChieruzzi,
39-
RichardHufford,
40-
Rowsam,
41-
Tester,
42-
Tranquilizer,
43-
Weiner,
44-
White,
45-
WmAdams,
46-
Yamachi,
23+
SecondByAppold,
24+
SecondByBlack,
25+
SecondByBorufsen,
26+
SecondByCave,
27+
SecondByChampion,
28+
SecondByColbert,
29+
SecondByEatherley,
30+
SecondByGetzler,
31+
SecondByGladstein,
32+
SecondByGraaskampKatzen,
33+
SecondByHarrington,
34+
SecondByKluepfel,
35+
SecondByLeyvraz,
36+
SecondByMikkelson,
37+
SecondByGrofman,
38+
SecondByTidemanAndChieruzzi,
39+
SecondByRichardHufford,
40+
SecondByRowsam,
41+
SecondByTester,
42+
SecondByTranquilizer,
43+
SecondByWeiner,
44+
SecondByWhite,
45+
SecondByWmAdams,
46+
SecondByYamachi,
4747
)
4848
from .backstabber import BackStabber, DoubleCrosser
4949
from .better_and_better import BetterAndBetter
@@ -254,20 +254,20 @@
254254
APavlov2006,
255255
APavlov2011,
256256
Appeaser,
257-
Appold,
257+
SecondByAppold,
258258
ArrogantQLearner,
259259
AverageCopier,
260260
BackStabber,
261261
BetterAndBetter,
262-
Black,
263-
Borufsen,
262+
SecondByBlack,
263+
SecondByBorufsen,
264264
Bully,
265265
BushMosteller,
266266
Calculator,
267267
CautiousQLearner,
268-
Cave,
269-
Champion,
270-
Colbert,
268+
SecondByCave,
269+
SecondByChampion,
270+
SecondByColbert,
271271
CollectiveStrategy,
272272
ContriteTitForTat,
273273
Cooperator,
@@ -291,7 +291,7 @@
291291
Doubler,
292292
DoubleResurrection,
293293
EasyGo,
294-
Eatherley,
294+
SecondByEatherley,
295295
EugineNier,
296296
EventualCycleHunter,
297297
EvolvedANN,
@@ -317,16 +317,16 @@
317317
GellerCooperator,
318318
GellerDefector,
319319
GeneralSoftGrudger,
320-
Getzler,
321-
Gladstein,
320+
SecondByGetzler,
321+
SecondByGladstein,
322322
GoByMajority,
323323
GoByMajority10,
324324
GoByMajority20,
325325
GoByMajority40,
326326
GoByMajority5,
327327
Golden,
328328
Graaskamp,
329-
GraaskampKatzen,
329+
SecondByGraaskampKatzen,
330330
Gradual,
331331
GradualKiller,
332332
Grofman,
@@ -342,31 +342,31 @@
342342
HardProber,
343343
HardTitFor2Tats,
344344
HardTitForTat,
345-
Harrington,
345+
SecondByHarrington,
346346
HesitantQLearner,
347347
Hopeless,
348348
Inverse,
349349
InversePunisher,
350350
Joss,
351-
Kluepfel,
351+
SecondByKluepfel,
352352
KnowledgeableWorseAndWorse,
353353
LevelPunisher,
354-
Leyvraz,
354+
SecondByLeyvraz,
355355
LimitedRetaliate,
356356
LimitedRetaliate2,
357357
LimitedRetaliate3,
358358
MathConstantHunter,
359359
NaiveProber,
360360
MEM2,
361361
Michaelos,
362-
Mikkelson,
362+
SecondByMikkelson,
363363
MindBender,
364364
MindController,
365365
MindReader,
366366
MindWarper,
367367
MirrorMindReader,
368-
MoreGrofman,
369-
MoreTidemanAndChieruzzi,
368+
SecondByGrofman,
369+
SecondByTidemanAndChieruzzi,
370370
Negation,
371371
NiceAverageCopier,
372372
NTitsForMTats,
@@ -397,10 +397,10 @@
397397
Retaliate2,
398398
Retaliate3,
399399
RevisedDowning,
400-
RichardHufford,
400+
SecondByRichardHufford,
401401
Ripoff,
402402
RiskyQLearner,
403-
Rowsam,
403+
SecondByRowsam,
404404
SelfSteem,
405405
ShortMem,
406406
Shubik,
@@ -416,7 +416,7 @@
416416
StochasticCooperator,
417417
StochasticWSLS,
418418
SuspiciousTitForTat,
419-
Tester,
419+
SecondByTester,
420420
TF1,
421421
TF2,
422422
TF3,
@@ -426,7 +426,7 @@
426426
TidemanAndChieruzzi,
427427
TitForTat,
428428
TitFor2Tats,
429-
Tranquilizer,
429+
SecondByTranquilizer,
430430
TrickyCooperator,
431431
TrickyDefector,
432432
TrickyLevelPunisher,
@@ -435,18 +435,18 @@
435435
UsuallyCooperates,
436436
UsuallyDefects,
437437
VeryBad,
438-
Weiner,
439-
White,
438+
SecondByWeiner,
439+
SecondByWhite,
440440
Willing,
441441
Winner12,
442442
Winner21,
443443
WinShiftLoseStay,
444444
WinStayLoseShift,
445-
WmAdams,
445+
SecondByWmAdams,
446446
WorseAndWorse,
447447
WorseAndWorse2,
448448
WorseAndWorse3,
449-
Yamachi,
449+
SecondByYamachi,
450450
ZDExtortion,
451451
ZDExtort2,
452452
ZDExtort3,

axelrod/strategies/axelrod_first.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,8 @@ def strategy(self, opponent: Player) -> Action:
293293
return C
294294

295295

296+
# TODO Need to check this one, a MoreGrofman existed in
297+
# axelrod_second
296298
class Grofman(Player):
297299
"""
298300
Submitted to Axelrod's first tournament by Bernard Grofman.
@@ -658,6 +660,8 @@ def strategy(self, opponent: Player) -> Action:
658660
return opponent.history[-1]
659661

660662

663+
# TODO Need to check this one, a MoreTidemanAndChieruzzi existed in
664+
# axelrod_second
661665
class TidemanAndChieruzzi(Player):
662666
"""
663667
This strategy begins by playing Tit For Tat and then follows the following

0 commit comments

Comments
 (0)