Cleanup post rebase, update some imports

Author: marcharper

axelrod/evolvable_player.py

@@ -1,5 +1,4 @@
 import base64
-import copy
 from pickle import dumps, loads
 from typing import Dict, List
 from .player import Player

axelrod/match.py

@@ -6,7 +6,7 @@
 from axelrod import Classifiers
 from axelrod.game import Game
 from axelrod.random_ import RandomGenerator
-from .deterministic_cache import DeterministicCache
+from axelrod.deterministic_cache import DeterministicCache
 
 C, D = Action.C, Action.D
 

axelrod/moran.py

@@ -7,10 +7,10 @@
 import numpy as np
 from axelrod import EvolvablePlayer, DEFAULT_TURNS, Game, Player
 
-from .deterministic_cache import DeterministicCache
-from .graph import Graph, complete_graph
-from .match import Match
-from .random_ import RandomGenerator, BulkRandomGenerator
+from axelrod.deterministic_cache import DeterministicCache
+from axelrod.graph import Graph, complete_graph
+from axelrod.match import Match
+from axelrod.random_ import RandomGenerator, BulkRandomGenerator
 
 
 class MoranProcess(object):

axelrod/plot.py

@@ -1,12 +1,12 @@
 from distutils.version import LooseVersion
+import pathlib
 from typing import List, Union
 
 import matplotlib
 import matplotlib.pyplot as plt
 import matplotlib.transforms as transforms
-import pathlib
-import tqdm
 from numpy import arange, median, nan_to_num
+import tqdm
 
 from .result_set import ResultSet
 from .load_data_ import axl_filename

axelrod/result_set.py

@@ -5,11 +5,10 @@
 from typing import List
 import warnings
 
-import numpy as np
-import tqdm
-
 import dask as da
 import dask.dataframe as dd
+import numpy as np
+import tqdm
 
 from axelrod.action import Action
 from . import eigen

axelrod/tests/integration/test_filtering.py

@@ -2,7 +2,6 @@
 import warnings
 
 import axelrod as axl
-from axelrod import filtered_strategies, short_run_time_strategies
 from axelrod.tests.property import strategy_lists
 
 from hypothesis import example, given, settings

axelrod/tests/strategies/test_axelrod_second.py

@@ -1,11 +1,6 @@
 """Tests for the Second Axelrod strategies."""
 
-import random
-
 import axelrod as axl
-
-import numpy as np
-
 from .test_player import TestPlayer
 
 C, D = axl.Action.C, axl.Action.D
@@ -1155,9 +1150,8 @@ def test_strategy(self):
         ]
         # Enter defect mode.
         expected_actions += [(D, C)]
-        random.seed(10)
         player = self.player()
-        match = axl.Match((player, axl.Random()), turns=len(expected_actions))
+        match = axl.Match((player, axl.Random()), turns=len(expected_actions), seed=10)
         # The history matrix will be [[0, 2], [5, 6], [3, 6], [4, 2]]
         actions = match.play()
         self.assertEqual(actions, expected_actions)

axelrod/tests/strategies/test_cycler.py

@@ -1,7 +1,6 @@
 """Tests for the Cycler strategies."""
 import unittest
 import itertools
-import random
 
 import axelrod as axl
 from axelrod._strategy_utils import detect_cycle
@@ -12,6 +11,7 @@
 from .test_evolvable_player import PartialClass, TestEvolvablePlayer
 
 C, D = Action.C, Action.D
+random = axl.RandomGenerator()
 
 
 class TestAntiCycler(TestPlayer):

axelrod/tests/strategies/test_evolvable_player.py

@@ -1,4 +1,3 @@
-import unittest
 import functools
 import unittest
 

axelrod/tests/strategies/test_finite_state_machines.py

@@ -1,9 +1,6 @@
 """Tests for Finite State Machine Strategies."""
-
 import unittest
 
-import random
-
 import axelrod as axl
 from axelrod.compute_finite_state_machine_memory import get_memory_from_transitions
 from axelrod.evolvable_player import InsufficientParametersError
@@ -13,7 +10,7 @@
 from .test_evolvable_player import PartialClass, TestEvolvablePlayer
 
 C, D = axl.Action.C, axl.Action.D
-
+random = axl.RandomGenerator()
 
 class TestSimpleFSM(unittest.TestCase):
     def setUp(self):

axelrod/tests/strategies/test_gambler.py

@@ -1,10 +1,7 @@
 """Test for the Gambler strategy. Most tests come from the LookerUp test suite.
 """
-import unittest
-
 import copy
-
-import random
+import unittest
 
 import axelrod as axl
 from axelrod.load_data_ import load_pso_tables
@@ -17,7 +14,7 @@
 
 tables = load_pso_tables("pso_gambler.csv", directory="data")
 C, D = axl.Action.C, axl.Action.D
-
+random = axl.RandomGenerator()
 
 class TestGambler(TestPlayer):
 

axelrod/tests/strategies/test_lookerup.py

@@ -1,10 +1,7 @@
 """Test for the Looker Up strategy."""
 
-import unittest
-
 import copy
-
-import random
+import unittest
 
 import axelrod as axl
 from axelrod.action import str_to_actions
@@ -20,7 +17,7 @@
 from .test_player import TestPlayer
 
 C, D = axl.Action.C, axl.Action.D
-
+random = axl.RandomGenerator()
 
 class TestLookupTable(unittest.TestCase):
     lookup_dict = {

axelrod/tests/strategies/test_mindreader.py

@@ -1,6 +1,6 @@
 """Tests for the Mindreader strategy."""
 
-import axl as axl
+import axelrod as axl
 from axelrod._strategy_utils import simulate_match
 
 from .test_player import TestPlayer

axelrod/tests/strategies/test_qlearner.py

@@ -1,9 +1,6 @@
 """Tests for the QLearner strategies."""
 
-import random
-
 import axelrod as axl
-
 from .test_player import TestPlayer
 
 C, D = axl.Action.C, axl.Action.D

axelrod/tests/strategies/test_retaliate.py

@@ -2,7 +2,7 @@
 
 import axelrod as axl
 
-from .test_player import TestOpponent, TestPlayer
+from .test_player import TestPlayer
 
 C, D = axl.Action.C, axl.Action.D
 

axelrod/tests/strategies/test_selfsteem.py

@@ -1,7 +1,5 @@
 """Tests for the SelfSteem strategy."""
 
-import random
-
 import axelrod as axl
 
 from .test_player import TestPlayer

axelrod/tests/unit/test_deterministic_cache.py

@@ -1,7 +1,7 @@
-import unittest
 import os
 import pathlib
 import pickle
+import unittest
 
 import axelrod as axl
 from axelrod.load_data_ import axl_filename

axelrod/tests/unit/test_eigen.py

@@ -2,51 +2,50 @@
 
 import unittest
 
-import numpy
+import numpy as np
 from numpy.testing import assert_array_almost_equal
 
 from axelrod.eigen import _normalise, principal_eigenvector
 
 
-
 class FunctionCases(unittest.TestCase):
     def test_identity_matrices(self):
         for size in range(2, 6):
-            mat = numpy.identity(size)
+            mat = np.identity(size)
             evector, evalue = principal_eigenvector(mat)
             self.assertAlmostEqual(evalue, 1)
-            assert_array_almost_equal(evector, _normalise(numpy.ones(size)))
+            assert_array_almost_equal(evector, _normalise(np.ones(size)))
 
     def test_zero_matrix(self):
-        mat = numpy.array([[0, 0], [0, 0]])
+        mat = np.array([[0, 0], [0, 0]])
         evector, evalue = principal_eigenvector(mat)
-        self.assertTrue(numpy.isnan(evalue))
-        self.assertTrue(numpy.isnan(evector[0]))
-        self.assertTrue(numpy.isnan(evector[1]))
+        self.assertTrue(np.isnan(evalue))
+        self.assertTrue(np.isnan(evector[0]))
+        self.assertTrue(np.isnan(evector[1]))
 
     def test_2x2_matrix(self):
-        mat = numpy.array([[2, 1], [1, 2]])
+        mat = np.array([[2, 1], [1, 2]])
         evector, evalue = principal_eigenvector(mat)
         self.assertAlmostEqual(evalue, 3)
-        assert_array_almost_equal(evector, numpy.dot(mat, evector) / evalue)
-        assert_array_almost_equal(evector, _normalise(numpy.array([1, 1])))
+        assert_array_almost_equal(evector, np.dot(mat, evector) / evalue)
+        assert_array_almost_equal(evector, _normalise(np.array([1, 1])))
 
     def test_3x3_matrix(self):
-        mat = numpy.array([[1, 2, 0], [-2, 1, 2], [1, 3, 1]])
+        mat = np.array([[1, 2, 0], [-2, 1, 2], [1, 3, 1]])
         evector, evalue = principal_eigenvector(
             mat, maximum_iterations=None, max_error=1e-10
         )
         self.assertAlmostEqual(evalue, 3)
-        assert_array_almost_equal(evector, numpy.dot(mat, evector) / evalue)
-        assert_array_almost_equal(evector, _normalise(numpy.array([0.5, 0.5, 1])))
+        assert_array_almost_equal(evector, np.dot(mat, evector) / evalue)
+        assert_array_almost_equal(evector, _normalise(np.array([0.5, 0.5, 1])))
 
     def test_4x4_matrix(self):
-        mat = numpy.array([[2, 0, 0, 0], [1, 2, 0, 0], [0, 1, 3, 0], [0, 0, 1, 3]])
+        mat = np.array([[2, 0, 0, 0], [1, 2, 0, 0], [0, 1, 3, 0], [0, 0, 1, 3]])
         evector, evalue = principal_eigenvector(
             mat, maximum_iterations=None, max_error=1e-10
         )
         self.assertAlmostEqual(evalue, 3, places=3)
-        assert_array_almost_equal(evector, numpy.dot(mat, evector) / evalue)
+        assert_array_almost_equal(evector, np.dot(mat, evector) / evalue)
         assert_array_almost_equal(
-            evector, _normalise(numpy.array([0, 0, 0, 1])), decimal=4
+            evector, _normalise(np.array([0, 0, 0, 1])), decimal=4
         )

axelrod/tests/unit/test_fingerprint.py

@@ -1,19 +1,18 @@
+import matplotlib.pyplot
+import os
+import pathlib
+from tempfile import mkstemp
 import unittest
 from unittest.mock import patch
 
-import os
-from tempfile import mkstemp
-import matplotlib.pyplot
+from hypothesis import given, settings
 import numpy as np
-import pathlib
 
 import axelrod as axl
 from axelrod.fingerprint import AshlockFingerprint, Point, TransitiveFingerprint
 from axelrod.load_data_ import axl_filename
 from axelrod.tests.property import strategy_lists
 
-from hypothesis import given, settings
-
 
 C, D = axl.Action.C, axl.Action.D
 

axelrod/tests/unit/test_graph.py

@@ -1,6 +1,5 @@
-import unittest
-
 from collections import defaultdict
+import unittest
 
 import axelrod as axl
 

axelrod/tests/unit/test_history.py

@@ -1,6 +1,5 @@
-import unittest
-
 from collections import Counter
+import unittest
 
 import axelrod as axl
 from axelrod.history import History, LimitedHistory

axelrod/tests/unit/test_interaction_utils.py

@@ -1,6 +1,6 @@
-import unittest
-import tempfile
 from collections import Counter
+import tempfile
+import unittest
 
 import axelrod as axl
 

axelrod/tests/unit/test_match.py

@@ -1,12 +1,10 @@
-import unittest
-
 from collections import Counter
+import unittest
 
-import axelrod as axl
 from hypothesis import example, given
 from hypothesis.strategies import floats, integers
 
-from axelrod import Action
+import axelrod as axl
 from axelrod.deterministic_cache import DeterministicCache
 from axelrod.random_ import RandomGenerator
 from axelrod.tests.property import games

axelrod/tests/unit/test_moran.py

@@ -1,8 +1,9 @@
-import unittest
-import itertools
-import random
 from collections import Counter
+import itertools
+import unittest
+
 import matplotlib.pyplot as plt
+
 import axelrod as axl
 from axelrod import MoranProcess
 from axelrod.tests.property import strategy_lists
@@ -12,6 +13,7 @@
 
 
 C, D = axl.Action.C, axl.Action.D
+random = axl.RandomGenerator()
 
 
 class TestMoranProcess(unittest.TestCase):

axelrod/tests/unit/test_pickling.py

@@ -1,11 +1,10 @@
-import unittest
 import pickle
-import random
+import unittest
 
 import axelrod as axl
 
 C, D = axl.Action.C, axl.Action.D
-
+random = axl.RandomGenerator()
 
 # A set of classes to test pickling.
 

axelrod/tests/unit/test_plot.py

@@ -1,10 +1,9 @@
+import pathlib
+import tempfile
 import unittest
 
-import tempfile
 import matplotlib
 import matplotlib.pyplot as plt
-import pathlib
-
 from numpy import mean
 
 import axelrod as axl