Remove dynamic classes and tidy imports

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/interaction_utils.py

@@ -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/load_data_.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/match.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/mock_player.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/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/random_.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/result_set.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

axelrod/strategies/_strategies.py

@@ -44,12 +44,7 @@
     MathConstantHunter, RandomHunter, EventualCycleHunter)
 from .inverse import Inverse
 from .lookerup import (LookerUp,
-    EvolvedLookerUp0_0_1, EvolvedLookerUp0_0_2, EvolvedLookerUp0_0_3,
-    EvolvedLookerUp1_1_0, EvolvedLookerUp1_1_1, EvolvedLookerUp1_1_2,
-    EvolvedLookerUp1_1_3, EvolvedLookerUp1_1_4, EvolvedLookerUp2_2_0,
-    EvolvedLookerUp2_2_1, EvolvedLookerUp2_2_2, EvolvedLookerUp2_2_3,
-    EvolvedLookerUp2_2_4, EvolvedLookerUp3_3_1, EvolvedLookerUp3_3_2,
-    EvolvedLookerUp3_3_3, EvolvedLookerUp4_4_1, EvolvedLookerUp4_4_2,
+    EvolvedLookerUp1_1_1, EvolvedLookerUp2_2_2,
     Winner12, Winner21)
 from .mathematicalconstants import Golden, Pi, e
 from .memoryone import (

axelrod/strategies/adaptive.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 import axelrod
 
 from typing import List

axelrod/strategies/alternator.py

@@ -1,5 +1,5 @@
-from axelrod import Actions, Player
-from axelrod.actions import Action
+from axelrod.actions import Action, Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/ann.py

@@ -6,7 +6,9 @@
 
 import numpy as np
 
-from axelrod import Actions, Player, load_weights
+from axelrod.actions import Actions
+from axelrod.player import Player
+from axelrod.load_data_ import load_weights
 
 C, D = Actions.C, Actions.D
 nn_weights = load_weights()
@@ -141,41 +143,6 @@ def split_weights(weights, num_features, num_hidden):
     return (input2hidden, hidden2output, bias)
 
 
-def activate(bias, hidden, output, inputs):
-    """
-    Compute the output of the neural network:
-        output = relu(inputs * hidden_weights + bias) * output_weights
-    """
-    inputs = np.array(inputs)
-    hidden_values = bias + np.dot(hidden, inputs)
-    hidden_values = relu(hidden_values)
-    output_value = np.dot(hidden_values, output)
-    return output_value
-
-
-def split_weights(weights, num_features, num_hidden):
-    """Splits the input vector into the the NN bias weights and layer
-    parameters."""
-    # Check weights is the right length
-    expected_length = num_hidden * 2 + num_features * num_hidden
-    if expected_length != len(weights):
-        raise ValueError("NN weights array has an incorrect size.")
-
-    number_of_input_to_hidden_weights = num_features * num_hidden
-    number_of_hidden_to_output_weights = num_hidden
-
-    input2hidden = []
-    for i in range(0, number_of_input_to_hidden_weights, num_features):
-        input2hidden.append(weights[i:i + num_features])
-
-    start = number_of_input_to_hidden_weights
-    end = number_of_input_to_hidden_weights + number_of_hidden_to_output_weights
-
-    hidden2output = weights[start: end]
-    bias = weights[end:]
-    return (input2hidden, hidden2output, bias)
-
-
 class ANN(Player):
     """A single layer neural network based strategy, with the following
     features:

axelrod/strategies/apavlov.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/appeaser.py

@@ -1,5 +1,5 @@
-from axelrod import Actions, Player
-from axelrod.actions import Action
+from axelrod.actions import Action, Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/averagecopier.py

@@ -1,5 +1,6 @@
-from axelrod import Actions, Player, random_choice
-from axelrod.actions import Action
+from axelrod.actions import Actions, Action
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 
 C, D = Actions.C, Actions.D
 
@@ -21,8 +22,7 @@ class AverageCopier(Player):
         'manipulates_state': False
     }
 
-    @staticmethod
-    def strategy(opponent: Player) -> Action:
+    def strategy(self, opponent: Player) -> Action:
         if len(opponent.history) == 0:
             # Randomly picks a strategy (not affected by history).
             return random_choice(0.5)
@@ -44,8 +44,7 @@ class NiceAverageCopier(Player):
         'manipulates_state': False
     }
 
-    @staticmethod
-    def strategy(opponent: Player) -> Action:
+    def strategy(self, opponent: Player) -> Action:
         if len(opponent.history) == 0:
             return C
         p = opponent.cooperations // len(opponent.history)

axelrod/strategies/axelrod_first.py

@@ -4,7 +4,9 @@
 
 import random
 
-from axelrod import Actions, Player, flip_action, random_choice
+from axelrod.actions import Actions, flip_action
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 from.memoryone import MemoryOnePlayer
 
 C, D = Actions.C, Actions.D

axelrod/strategies/axelrod_second.py

@@ -4,8 +4,9 @@
 
 import random
 
-from axelrod import Actions, Player, flip_action, random_choice
-from axelrod.actions import Action
+from axelrod.actions import Actions, Action, flip_action
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/backstabber.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from axelrod.strategy_transformers import FinalTransformer
 from axelrod.actions import Action
 

axelrod/strategies/better_and_better.py

@@ -1,4 +1,6 @@
-from axelrod import Actions, Player, random_choice
+from axelrod.actions import Actions
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 from axelrod.actions import Action
 
 C, D = Actions.C, Actions.D

axelrod/strategies/calculator.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from .axelrod_first import Joss
 from axelrod._strategy_utils import detect_cycle
 from axelrod.actions import Action

axelrod/strategies/cooperator.py

@@ -1,5 +1,5 @@
-from axelrod import Actions, Player
-from axelrod.actions import Action
+from axelrod.actions import Actions, Action
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/cycler.py

@@ -1,5 +1,5 @@
-from axelrod import Actions, Player, init_args
-from axelrod.actions import Action
+from axelrod.actions import Actions, Action
+from axelrod.player import Player, init_args
 
 import copy
 

axelrod/strategies/darwin.py

@@ -1,6 +1,6 @@
 import inspect
-from axelrod import Actions, Player
-from axelrod.actions import Action
+from axelrod.actions import Action, Actions
+from axelrod.player import Player
 
 from typing import List
 

axelrod/strategies/defector.py

@@ -1,5 +1,5 @@
-from axelrod import Actions, Player
-from axelrod.actions import Action
+from axelrod.actions import Actions, Action
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/doubler.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/finite_state_machines.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/forgiver.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from axelrod.actions import Action
 
 C, D = Actions.C, Actions.D
@@ -21,8 +22,7 @@ class Forgiver(Player):
         'manipulates_state': False
     }
 
-    @staticmethod
-    def strategy(opponent: Player) -> Action:
+    def strategy(self, opponent: Player) -> Action:
         """
         Begins by playing C, then plays D if the opponent has defected more than 10 percent of the time
         """
@@ -49,8 +49,7 @@ class ForgivingTitForTat(Player):
         'manipulates_state': False
     }
 
-    @staticmethod
-    def strategy(opponent: Player) -> Action:
+    def strategy(self, opponent: Player) -> Action:
         """
         Begins by playing C, then plays D if,
         the opponent has defected more than 10 percent of the time,

axelrod/strategies/gambler.py

@@ -5,7 +5,9 @@
  https://gist.github.com/GDKO/60c3d0fd423598f3c4e4
 """
 
-from axelrod import Actions, load_pso_tables, random_choice
+from axelrod.actions import Actions
+from axelrod.load_data_ import load_pso_tables
+from axelrod.random_ import random_choice
 from .lookerup import LookerUp, create_lookup_table_from_pattern
 
 

axelrod/strategies/geller.py

@@ -1,6 +1,8 @@
 import inspect
 
-from axelrod import Actions, Player, random_choice
+from axelrod.actions import Actions
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/gobymajority.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 import copy
 

axelrod/strategies/gradualkiller.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from axelrod.strategy_transformers import InitialTransformer
 from axelrod.actions import Action
 

axelrod/strategies/grudger.py

@@ -1,5 +1,5 @@
-from axelrod import Actions, Player
-from axelrod.actions import Action
+from axelrod.actions import Actions, Action
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D