Skip to content

Commit 89078dd

Browse files
committed
Maintained same order of imports in strategies/__init__.py
1 parent 83e6c54 commit 89078dd

File tree

1 file changed

+11
-18
lines changed

1 file changed

+11
-18
lines changed

axelrod/strategies/__init__.py

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
from ..classifier import Classifiers
2-
from ._filters import passes_filterset
32
from ._strategies import *
3+
from ._filters import passes_filterset
4+
5+
# `from ._strategies import *` import the collection `strategies`
6+
# Now import the Meta strategies. This cannot be done in _strategies
7+
# because it creates circular dependencies
8+
49
from .meta import (
510
MemoryDecay,
611
MetaHunter,
712
MetaHunterAggressive,
13+
MetaPlayer,
814
MetaMajority,
15+
MetaMajorityMemoryOne,
916
MetaMajorityFiniteMemory,
1017
MetaMajorityLongMemory,
11-
MetaMajorityMemoryOne,
1218
MetaMinority,
1319
MetaMixer,
14-
MetaPlayer,
1520
MetaWinner,
1621
MetaWinnerDeterministic,
1722
MetaWinnerEnsemble,
23+
MetaWinnerMemoryOne,
1824
MetaWinnerFiniteMemory,
1925
MetaWinnerLongMemory,
20-
MetaWinnerMemoryOne,
2126
MetaWinnerStochastic,
22-
NiceMetaWinner,
23-
NiceMetaWinnerEnsemble,
2427
NMWEDeterministic,
2528
NMWEFiniteMemory,
2629
NMWELongMemory,
2730
NMWEMemoryOne,
2831
NMWEStochastic,
32+
NiceMetaWinner,
33+
NiceMetaWinnerEnsemble,
2934
)
3035

31-
# `from ._strategies import *` import the collection `strategies`
32-
# Now import the Meta strategies. This cannot be done in _strategies
33-
# because it creates circular dependencies
34-
35-
3636
all_strategies += [
3737
MemoryDecay,
3838
MetaHunter,
@@ -99,18 +99,14 @@ def filtered_strategies(filterset, strategies=all_strategies):
9999
Applies the filters defined in the given filterset dict and returns those
100100
strategy classes which pass all of those filters from the given list of
101101
strategies.
102-
103102
e.g.
104-
105103
For the filterset dict:
106104
{
107105
'stochastic': True,
108106
'min_memory_depth': 2
109107
}
110-
111108
the function will return a list of all deterministic strategies with a
112109
memory_depth of 2 or more.
113-
114110
Parameters
115111
----------
116112
filterset : dict
@@ -122,12 +118,9 @@ def filtered_strategies(filterset, strategies=all_strategies):
122118
}
123119
strategies: list
124120
of subclasses of axelrod.Player
125-
126121
Returns
127122
-------
128123
list
129-
130124
of subclasses of axelrod.Player
131-
132125
"""
133126
return [s for s in strategies if passes_filterset(s, filterset)]

0 commit comments

Comments
 (0)