Merge pull request #692 from Axelrod-Python/690

Add long_run_time classifier

Author: meatballs

axelrod/player.py

@@ -73,6 +73,7 @@ class Player(object):
         'stochastic': False,
         'memory_depth': float('inf'),
         'makes_use_of': None,
+        'long_run_time': False,
         'inspects_source': None,
         'manipulates_source': None,
         'manipulates_state': None

axelrod/strategies/__init__.py

@@ -12,21 +12,20 @@
     MetaMixer
     )
 
-all_strategies.append(MetaHunter)
+all_strategies.extend([MetaHunter, MetaMajority, MetaMinority, MetaWinner,
+                       MetaMajorityMemoryOne, MetaWinnerMemoryOne,
+                       MetaMajorityFiniteMemory, MetaWinnerFiniteMemory,
+                       MetaMajorityLongMemory, MetaWinnerLongMemory, MetaMixer])
 
-long_run_time_strategies = [MetaMajority, MetaMinority, MetaWinner,
-                   MetaMajorityMemoryOne, MetaWinnerMemoryOne,
-                   MetaMajorityFiniteMemory, MetaWinnerFiniteMemory,
-                   MetaMajorityLongMemory, MetaWinnerLongMemory, MetaMixer]
-
-all_strategies.extend(long_run_time_strategies)
 
 # Distinguished strategy collections in addition to
 # `all_strategies` from _strategies.py
-
 demo_strategies = [Cooperator, Defector, TitForTat, Grudger, Random]
 basic_strategies = [s for s in all_strategies if is_basic(s())]
 strategies = [s for s in all_strategies if obey_axelrod(s())]
+
+long_run_time_strategies = [s for s in all_strategies if
+                            s().classifier['long_run_time']]
 cheating_strategies = [s for s in all_strategies if not obey_axelrod(s())]
 
 ordinary_strategies = strategies  # This is a legacy and will be removed

axelrod/strategies/adaptive.py

@@ -12,6 +12,7 @@ class Adaptive(Player):
         'memory_depth': float('inf'),  # Long memory
         'stochastic': False,
         'makes_use_of': set(["game"]),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False

axelrod/strategies/alternator.py

@@ -9,6 +9,7 @@ class Alternator(Player):
         'memory_depth': 1,
         'stochastic': False,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False

axelrod/strategies/apavlov.py

@@ -19,6 +19,7 @@ class APavlov2006(Player):
         'memory_depth': float('inf'),
         'stochastic': False,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False
@@ -85,6 +86,7 @@ class APavlov2011(Player):
         'memory_depth': float('inf'),
         'stochastic': False,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False

axelrod/strategies/appeaser.py

@@ -14,6 +14,7 @@ class Appeaser(Player):
         'memory_depth': float('inf'),  # Depends on internal memory.
         'stochastic': False,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False

axelrod/strategies/averagecopier.py

@@ -12,6 +12,7 @@ class AverageCopier(Player):
         'memory_depth': float('inf'),  # Long memory
         'stochastic': True,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False
@@ -34,6 +35,7 @@ class NiceAverageCopier(Player):
         'memory_depth': float('inf'),  # Long memory
         'stochastic': True,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False

axelrod/strategies/axelrod_first.py

@@ -20,6 +20,7 @@ class Davis(Player):
         'memory_depth': float('inf'),  # Long memory
         'stochastic': False,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False
@@ -58,6 +59,7 @@ class RevisedDowning(Player):
         'memory_depth': float('inf'),
         'stochastic': False,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False
@@ -134,6 +136,7 @@ class Feld(Player):
         'memory_depth': 200, # Varies actually, eventually becomes depth 1
         'stochastic': True,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False
@@ -189,6 +192,7 @@ class Grofman(Player):
         'memory_depth': float('inf'),
         'stochastic': True,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False
@@ -260,6 +264,7 @@ class Nydegger(Player):
         'memory_depth': 3,
         'stochastic': False,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False
@@ -314,6 +319,7 @@ class Shubik(Player):
         'memory_depth': float('inf'),
         'stochastic': False,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False
@@ -373,6 +379,7 @@ class Tullock(Player):
         'memory_depth': 11, # long memory, modified by init
         'stochastic': True,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False
@@ -427,6 +434,7 @@ class UnnamedStrategy(Player):
         'memory_depth': 0,
         'stochastic': True,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False

axelrod/strategies/axelrod_second.py

@@ -19,6 +19,7 @@ class Champion(Player):
         'memory_depth': float('inf'),
         'stochastic': True,
         'makes_use_of': set(["length"]),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False
@@ -54,6 +55,7 @@ class Eatherley(Player):
         'memory_depth': float('inf'),
         'stochastic': True,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False
@@ -86,6 +88,7 @@ class Tester(Player):
         'memory_depth': float('inf'),
         'stochastic': False,
         'makes_use_of': set(),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False

axelrod/strategies/backstabber.py

@@ -16,6 +16,7 @@ class BackStabber(Player):
         'memory_depth': float('inf'),
         'stochastic': False,
         'makes_use_of': set(['length']),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False
@@ -43,6 +44,7 @@ class DoubleCrosser(Player):
         'memory_depth': float('inf'),
         'stochastic': False,
         'makes_use_of': set(['length']),
+        'long_run_time': False,
         'inspects_source': False,
         'manipulates_source': False,
         'manipulates_state': False