Merge pull request #852 from Axelrod-Python/845

Remove dynamic classes and tidy imports

Author: meatballs

axelrod/__init__.py

@@ -4,7 +4,7 @@
 
 # The order of imports matters!
 from .version import __version__
-from .load_data_ import load_lookerup_tables, load_pso_tables, load_weights
+from .load_data_ import load_pso_tables, load_weights
 from . import graph
 from .actions import Actions, flip_action
 from .random_ import random_choice, seed

axelrod/_strategy_utils.py

@@ -2,8 +2,8 @@
 import itertools
 from functools import lru_cache
 
-from axelrod import update_history
-from axelrod import Actions
+from axelrod.player import update_history
+from axelrod.actions import Actions
 
 from axelrod.strategies.cycler import Cycler
 

axelrod/data/lookup_tables.csv

@@ -10,7 +10,7 @@
 from collections import Counter
 import csv
 
-from axelrod import Actions
+from axelrod.actions import Actions
 from .game import Game
 
 import tqdm

axelrod/interaction_utils.py

@@ -29,16 +29,6 @@ def load_weights(filename="ann_weights.csv", directory="data"):
     return d
 
 
-def load_lookerup_tables(filename="lookup_tables.csv", directory="data"):
-    """Load lookup tables."""
-    rows = load_file(filename, directory)
-    d = dict()
-    for row in rows:
-        name, a, b, c, initial, pattern = row
-        d[(name, int(a), int(b), int(c))] = (initial, pattern)
-    return d
-
-
 def load_pso_tables(filename="pso_gambler.csv", directory="data"):
     """Load lookup tables."""
     rows = load_file(filename, directory)

axelrod/load_data_.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Game
+from axelrod.actions import Actions
+from axelrod.game import Game
 import axelrod.interaction_utils as iu
 from .deterministic_cache import DeterministicCache
 

axelrod/match.py

@@ -1,6 +1,6 @@
 import warnings
-from axelrod import Actions, Player, update_history, update_state_distribution
-from axelrod.actions import Action
+from axelrod.actions import Actions, Action
+from axelrod.player import Player, update_history, update_state_distribution
 from collections import defaultdict
 
 from typing import List, Tuple

axelrod/mock_player.py

@@ -3,7 +3,7 @@
 import random
 import copy
 
-from axelrod import Actions, flip_action
+from axelrod.actions import Actions, flip_action
 from .game import DefaultGame
 
 

axelrod/player.py

@@ -1,7 +1,6 @@
 import random
 import numpy
-from axelrod import Actions
-from axelrod.actions import Action
+from axelrod.actions import Action, Actions
 
 
 def random_choice(p: float = 0.5) -> Action:

axelrod/random_.py

@@ -4,7 +4,7 @@
 from numpy import mean, nanmedian, std
 import tqdm
 
-from axelrod import Actions
+from axelrod.actions import Actions
 import axelrod.interaction_utils as iu
 from . import eigen
 from .game import Game