Skip to content

Commit d811278

Browse files
committed
reverted _strategies.py
1 parent 2c0bf78 commit d811278

File tree

1 file changed

+43
-33
lines changed

1 file changed

+43
-33
lines changed

axelrod/strategies/_strategies.py

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,29 @@
1818
ReactivePlayer,
1919
MemoryOnePlayer
2020
)
21-
isort:skip_file
21+
# isort:skip_file
2222
"""
2323
from .adaptive import Adaptive
2424
from .adaptor import AdaptorBrief, AdaptorLong
2525
from .alternator import Alternator
26-
from .ann import ( # pylint: disable=unused-import
27-
ANN,
28-
EvolvableANN,
29-
EvolvedANN,
30-
EvolvedANN5,
31-
EvolvedANNNoise05,
32-
)
26+
from .ann import EvolvedANN, EvolvedANN5, EvolvedANNNoise05
27+
from .ann import ANN, EvolvableANN # pylint: disable=unused-import
3328
from .apavlov import APavlov2006, APavlov2011
3429
from .appeaser import Appeaser
3530
from .averagecopier import AverageCopier, NiceAverageCopier
3631
from .axelrod_first import (
37-
FirstByAnonymous,
3832
FirstByDavis,
39-
FirstByDowning,
4033
FirstByFeld,
4134
FirstByGraaskamp,
4235
FirstByGrofman,
4336
FirstByJoss,
4437
FirstByNydegger,
38+
FirstByDowning,
4539
FirstByShubik,
4640
FirstBySteinAndRapoport,
4741
FirstByTidemanAndChieruzzi,
4842
FirstByTullock,
43+
FirstByAnonymous,
4944
)
5045
from .axelrod_second import (
5146
SecondByAppold,
@@ -58,15 +53,15 @@
5853
SecondByGetzler,
5954
SecondByGladstein,
6055
SecondByGraaskampKatzen,
61-
SecondByGrofman,
6256
SecondByHarrington,
6357
SecondByKluepfel,
6458
SecondByLeyvraz,
6559
SecondByMikkelson,
60+
SecondByGrofman,
61+
SecondByTidemanAndChieruzzi,
6662
SecondByRichardHufford,
6763
SecondByRowsam,
6864
SecondByTester,
69-
SecondByTidemanAndChieruzzi,
7065
SecondByTranquilizer,
7166
SecondByWeiner,
7267
SecondByWhite,
@@ -78,52 +73,52 @@
7873
from .bush_mosteller import BushMosteller
7974
from .calculator import Calculator
8075
from .cooperator import Cooperator, TrickyCooperator
81-
from .cycler import AntiCycler # pylint: disable=unused-import
8276
from .cycler import (
83-
Cycler,
77+
AntiCycler,
8478
CyclerCCCCCD,
8579
CyclerCCCD,
8680
CyclerCCCDCD,
8781
CyclerCCD,
8882
CyclerDC,
8983
CyclerDDC,
90-
EvolvableCycler,
9184
)
85+
from .cycler import Cycler, EvolvableCycler # pylint: disable=unused-import
9286
from .darwin import Darwin
9387
from .dbs import DBS
9488
from .defector import Defector, TrickyDefector
9589
from .doubler import Doubler
96-
from .finite_state_machines import ( # pylint: disable=unused-import
90+
from .finite_state_machines import (
9791
TF1,
9892
TF2,
9993
TF3,
100-
EvolvableFSMPlayer,
10194
EvolvedFSM4,
10295
EvolvedFSM16,
10396
EvolvedFSM16Noise05,
10497
Fortress3,
10598
Fortress4,
106-
FSMPlayer,
10799
Predator,
108100
Pun1,
109101
Raider,
110102
Ripoff,
103+
UsuallyCooperates,
104+
UsuallyDefects,
111105
SolutionB1,
112106
SolutionB5,
113107
Thumper,
114-
UsuallyCooperates,
115-
UsuallyDefects,
108+
)
109+
from .finite_state_machines import ( # pylint: disable=unused-import
110+
EvolvableFSMPlayer,
111+
FSMPlayer,
116112
)
117113
from .forgiver import Forgiver, ForgivingTitForTat
118-
from .gambler import EvolvableGambler # pylint: disable=unused-import
119114
from .gambler import (
120-
Gambler,
121115
PSOGambler1_1_1,
122116
PSOGambler2_2_2,
123117
PSOGambler2_2_2_Noise05,
124118
PSOGamblerMem1,
125119
ZDMem2,
126120
)
121+
from .gambler import EvolvableGambler, Gambler # pylint: disable=unused-import
127122
from .geller import Geller, GellerCooperator, GellerDefector
128123
from .gobymajority import (
129124
GoByMajority,
@@ -150,8 +145,8 @@
150145
)
151146
from .grumpy import Grumpy
152147
from .handshake import Handshake
153-
from .hmm import EvolvableHMMPlayer # pylint: disable=unused-import
154-
from .hmm import EvolvedHMM5, HMMPlayer
148+
from .hmm import EvolvedHMM5
149+
from .hmm import EvolvableHMMPlayer, HMMPlayer # pylint: disable=unused-import
155150
from .human import Human # pylint: disable=unused-import
156151
from .hunter import (
157152
AlternatorHunter,
@@ -163,29 +158,36 @@
163158
RandomHunter,
164159
)
165160
from .inverse import Inverse
166-
from .lookerup import EvolvableLookerUp # pylint: disable=unused-import
167161
from .lookerup import (
168162
EvolvedLookerUp1_1_1,
169163
EvolvedLookerUp2_2_2,
170-
LookerUp,
171164
Winner12,
172165
Winner21,
173166
)
167+
from .lookerup import ( # pylint: disable=unused-import
168+
EvolvableLookerUp,
169+
LookerUp,
170+
)
171+
174172
from .mathematicalconstants import Golden, Pi, e
175-
from .memoryone import ( # pylint: disable=unused-import
173+
from .memoryone import (
176174
GTFT,
177175
ALLCorALLD,
178176
FirmButFair,
179-
MemoryOnePlayer,
180-
ReactivePlayer,
181177
SoftJoss,
182178
StochasticCooperator,
183179
StochasticWSLS,
184180
WinShiftLoseStay,
185181
WinStayLoseShift,
186182
)
187-
from .memorytwo import MemoryTwoPlayer # pylint: disable=unused-import
183+
from .memoryone import ( # pylint: disable=unused-import
184+
ReactivePlayer,
185+
MemoryOnePlayer,
186+
)
187+
188188
from .memorytwo import AON2, MEM2, DelayedAON1
189+
from .memorytwo import MemoryTwoPlayer # pylint: disable=unused-import
190+
189191
from .mindcontrol import MindBender, MindController, MindWarper
190192
from .mindreader import MindReader, MirrorMindReader, ProtectedMindReader
191193
from .mutual import Desperate, Hopeless, Willing
@@ -202,7 +204,12 @@
202204
Prober4,
203205
RemorsefulProber,
204206
)
205-
from .punisher import InversePunisher, LevelPunisher, Punisher, TrickyLevelPunisher
207+
from .punisher import (
208+
InversePunisher,
209+
LevelPunisher,
210+
Punisher,
211+
TrickyLevelPunisher,
212+
)
206213
from .qlearner import (
207214
ArrogantQLearner,
208215
CautiousQLearner,
@@ -221,8 +228,11 @@
221228
)
222229
from .revised_downing import RevisedDowning
223230
from .selfsteem import SelfSteem
224-
from .sequence_player import SequencePlayer # pylint: disable=unused-import
225-
from .sequence_player import ThueMorse, ThueMorseInverse
231+
from .sequence_player import ( # pylint: disable=unused-import
232+
SequencePlayer,
233+
ThueMorse,
234+
ThueMorseInverse,
235+
)
226236
from .shortmem import ShortMem
227237
from .stalker import Stalker
228238
from .titfortat import (

0 commit comments

Comments
 (0)