Merge pull request #1355 from gaffney2010/kill_makes_use_of

Implements a make_use_of function that automatically

Author: drvinceknight

.gitignore

@@ -119,6 +119,7 @@ docker-compose.yml
 # Mypy files
 .mypy_cache/
 
+test_outputs/classifier_test.yaml
 test_outputs/stochastic_tournament_0.csv
 test_outputs/stochastic_tournament_1.csv
 test_outputs/test_fingerprint.csv

axelrod/classifier.py

@@ -13,8 +13,9 @@
     Union,
 )
 
-import yaml
+from axelrod.makes_use_of import makes_use_of
 from axelrod.player import Player
+import yaml
 
 ALL_CLASSIFIERS_PATH = "data/all_classifiers.yml"
 
@@ -59,12 +60,18 @@ def classify_player(self, player: Type[Player]) -> T:
 
 
 stochastic = Classifier[bool]("stochastic", lambda _: False)
-memory_depth = Classifier[Union[float, int]]("memory_depth", lambda _: float("inf"))
-makes_use_of = Classifier[Optional[Set[Text]]]("makes_use_of", lambda _: None)
+memory_depth = Classifier[Union[float, int]](
+    "memory_depth", lambda _: float("inf")
+)
+makes_use_of = Classifier[Optional[Set[Text]]]("makes_use_of", makes_use_of)
 long_run_time = Classifier[bool]("long_run_time", lambda _: False)
 inspects_source = Classifier[Optional[bool]]("inspects_source", lambda _: None)
-manipulates_source = Classifier[Optional[bool]]("manipulates_source", lambda _: None)
-manipulates_state = Classifier[Optional[bool]]("manipulates_state", lambda _: None)
+manipulates_source = Classifier[Optional[bool]](
+    "manipulates_source", lambda _: None
+)
+manipulates_state = Classifier[Optional[bool]](
+    "manipulates_state", lambda _: None
+)
 
 # Should list all known classifiers.
 all_classifiers = [
@@ -77,6 +84,8 @@ def classify_player(self, player: Type[Player]) -> T:
     manipulates_state,
 ]
 
+all_classifiers_map = {c.name: c.classify_player for c in all_classifiers}
+
 
 def rebuild_classifier_table(
     classifiers: List[Classifier],
@@ -209,7 +218,13 @@ def try_lookup() -> Any:
                 return player.classifier[key]
 
             # Try to find the name in the all_player_dicts, read from disk.
-            return try_lookup()
+            lookup = try_lookup()
+            if lookup is not None:
+                return lookup
+
+            # If we can't find it, then return a function that calculates fresh.
+            global all_classifiers_map
+            return all_classifiers_map[key](player)
 
         return classify_player_for_this_classifier