Cover some uncovered lines

marcharper · marcharper · commit 43f6ab86350e · 2019-10-03T21:12:28.000-07:00
diff --git a/axelrod/strategies/ann.py b/axelrod/strategies/ann.py
@@ -222,6 +222,7 @@ def strategy(self, opponent: Player) -> Action:
 
 class EvolvableANN(ANN, EvolvablePlayer):
     """Evolvable version of ANN."""
+    name = "EvolvableANN"
 
     def __init__(
         self, num_features: int, num_hidden: int,
@@ -273,7 +274,7 @@ def mutate(self):
         return self.create_new(weights=weights)
 
     def crossover(self, other):
-        if not isinstance(other, self.__class__):
+        if other.__class__ != self.__class__:
             raise TypeError("Crossover must be between the same player classes.")
         weights = crossover_lists(self.weights, other.weights)
         return self.create_new(weights=weights)
diff --git a/axelrod/strategies/cycler.py b/axelrod/strategies/cycler.py
@@ -158,7 +158,7 @@ def crossover(self, other) -> EvolvablePlayer:
         """
         Creates and returns a new Player instance with a single crossover point.
         """
-        if not isinstance(other, self.__class__):
+        if other.__class__ != self.__class__:
             raise TypeError("Crossover must be between the same player classes.")
         cycle_list = crossover_lists(self.cycle, other.cycle)
         cycle = "".join(cycle_list)
diff --git a/axelrod/strategies/finite_state_machines.py b/axelrod/strategies/finite_state_machines.py
@@ -250,7 +250,7 @@ def crossover_rows(rows1, rows2):
         return new_rows
 
     def crossover(self, other):
-        if not isinstance(other, self.__class__):
+        if other.__class__ != self.__class__:
             raise TypeError("Crossover must be between the same player classes.")
         transitions = self.crossover_rows(self.fsm.transitions(), other.fsm.transitions())
         transitions = self.normalize_transitions(transitions)
diff --git a/axelrod/strategies/hmm.py b/axelrod/strategies/hmm.py
@@ -290,7 +290,7 @@ def mutate(self):
         )
 
     def crossover(self, other):
-        if not isinstance(other, self.__class__):
+        if other.__class__ != self.__class__:
             raise TypeError("Crossover must be between the same player classes.")
         transitions_C = crossover_lists(self.hmm.transitions_C, other.hmm.transitions_C)
         transitions_D = crossover_lists(self.hmm.transitions_D, other.hmm.transitions_D)
diff --git a/axelrod/strategies/lookerup.py b/axelrod/strategies/lookerup.py
@@ -500,7 +500,7 @@ def mutate(self):
         )
 
     def crossover(self, other):
-        if not isinstance(other, self.__class__):
+        if other.__class__ != self.__class__:
             raise TypeError("Crossover must be between the same player classes.")
         lookup_dict = crossover_dictionaries(self.lookup_dict, other.lookup_dict)
         return self.create_new(lookup_dict=lookup_dict)
diff --git a/axelrod/tests/strategies/test_ann.py b/axelrod/tests/strategies/test_ann.py
@@ -146,3 +146,6 @@ def test_equality_of_clone(self):
 
     def test_equality_of_pickle_clone(self):
         pass
+
+    def test_repr(self):
+        pass
diff --git a/axelrod/tests/strategies/test_cycler.py b/axelrod/tests/strategies/test_cycler.py
@@ -228,3 +228,6 @@ def test_equality_of_clone(self):
 
     def test_equality_of_pickle_clone(self):
         pass
+
+    def test_repr(self):
+        pass
diff --git a/axelrod/tests/strategies/test_evolvable_player.py b/axelrod/tests/strategies/test_evolvable_player.py
@@ -54,9 +54,14 @@ class TestEvolvablePlayer(TestPlayer):
     def player(self):
         return self.player_class(**self.init_parameters)
 
+    def test_repr(self):
+        """Test that the representation is correct."""
+        if not self.__class__ != EvolvablePlayer:
+            self.assertEqual(str(self.player()), self.name)
+
     def test_initialisation(self):
         """Test that the player initiates correctly."""
-        if not issubclass(self.__class__, TestPlayer):
+        if self.__class__ != TestEvolvablePlayer:
             player = self.player()
             self.assertEqual(len(player.history), 0)
             self.assertEqual(player.cooperations, 0)
@@ -159,15 +164,6 @@ def test_behavior(self):
         self.behavior_test(deserialized_player, parent_player)
 
 
-def compare_dicts(d1, d2):
-    """For investigating issues above."""
-    for k, v in d1.items():
-        if d2[k] != v:
-            print()
-            print(k, d1[k])
-            print(k, d2[k])
-
-
 class TestUtilityFunctions(unittest.TestCase):
 
     def test_copy_lists(self):
diff --git a/axelrod/tests/strategies/test_finite_state_machines.py b/axelrod/tests/strategies/test_finite_state_machines.py
@@ -1132,3 +1132,6 @@ def test_equality_of_clone(self):
 
     def test_equality_of_pickle_clone(self):
         pass
+
+    def test_repr(self):
+        pass
diff --git a/axelrod/tests/strategies/test_gambler.py b/axelrod/tests/strategies/test_gambler.py
@@ -575,3 +575,6 @@ def test_equality_of_clone(self):
 
     def test_equality_of_pickle_clone(self):
         pass
+
+    def test_repr(self):
+        pass
diff --git a/axelrod/tests/strategies/test_hmm.py b/axelrod/tests/strategies/test_hmm.py
@@ -303,3 +303,6 @@ def test_equality_of_clone(self):
 
     def test_equality_of_pickle_clone(self):
         pass
+
+    def test_repr(self):
+        pass
diff --git a/axelrod/tests/strategies/test_lookerup.py b/axelrod/tests/strategies/test_lookerup.py
@@ -762,3 +762,6 @@ def test_equality_of_pickle_clone(self):
 
     def test_zero_tables(self):
         pass
+
+    def test_repr(self):
+        pass
diff --git a/axelrod/tests/strategies/test_player.py b/axelrod/tests/strategies/test_player.py
@@ -379,7 +379,7 @@ def test_initialisation(self):
 
     def test_repr(self):
         """Test that the representation is correct."""
-        if not issubclass(self.__class__, TestPlayer):
+        if self.__class__ != TestPlayer:
             self.assertEqual(str(self.player()), self.name)
 
     def test_match_attributes(self):
diff --git a/axelrod/tests/unit/test_graph.py b/axelrod/tests/unit/test_graph.py
@@ -241,3 +241,64 @@ def test_size_4_with_loops(self):
         for vertex in range(4):
             self.assertEqual(set(g.out_vertices(vertex)), set(neighbors))
             self.assertEqual(set(g.in_vertices(vertex)), set(neighbors))
+
+
+class TestAttachedComplete(unittest.TestCase):
+    def test_size_2(self):
+        g = graph.attached_complete_graphs(2, loops=False)
+        self.assertEqual(g.vertices, ['0:0', '0:1', '1:0', '1:1'])
+        self.assertEqual(
+            g.edges,
+            [('0:0', '0:1'), ('0:1', '0:0'), ('1:0', '1:1'), ('1:1', '1:0'), ('0:0', '1:0'), ('1:0', '0:0')]
+        )
+        self.assertEqual(g.directed, False)
+
+    def test_size_3(self):
+        g = graph.attached_complete_graphs(3, loops=False)
+        self.assertEqual(g.vertices, ['0:0', '0:1', '0:2', '1:0', '1:1', '1:2'])
+        self.assertEqual(
+            g.edges,
+            [('0:0', '0:1'),
+             ('0:1', '0:0'),
+             ('0:0', '0:2'),
+             ('0:2', '0:0'),
+             ('0:1', '0:2'),
+             ('0:2', '0:1'),
+             ('1:0', '1:1'),
+             ('1:1', '1:0'),
+             ('1:0', '1:2'),
+             ('1:2', '1:0'),
+             ('1:1', '1:2'),
+             ('1:2', '1:1'),
+             ('0:0', '1:0'),
+             ('1:0', '0:0')]
+        )
+        self.assertEqual(g.directed, False)
+
+    def test_size_3_with_loops(self):
+        g = graph.attached_complete_graphs(3, loops=True)
+        self.assertEqual(g.vertices, ['0:0', '0:1', '0:2', '1:0', '1:1', '1:2'])
+        self.assertEqual(
+            g.edges,
+            [('0:0', '0:1'),
+             ('0:1', '0:0'),
+             ('0:0', '0:2'),
+             ('0:2', '0:0'),
+             ('0:1', '0:2'),
+             ('0:2', '0:1'),
+             ('1:0', '1:1'),
+             ('1:1', '1:0'),
+             ('1:0', '1:2'),
+             ('1:2', '1:0'),
+             ('1:1', '1:2'),
+             ('1:2', '1:1'),
+             ('0:0', '1:0'),
+             ('1:0', '0:0'),
+             ('0:0', '0:0'),
+             ('0:1', '0:1'),
+             ('0:2', '0:2'),
+             ('1:0', '1:0'),
+             ('1:1', '1:1'),
+             ('1:2', '1:2')]
+        )
+        self.assertEqual(g.directed, False)
diff --git a/axelrod/tests/unit/test_moran.py b/axelrod/tests/unit/test_moran.py
@@ -402,6 +402,14 @@ def test_atomic_mutation_cycler(self):
         self.assertEqual(len(mp.populations), 19)
         self.assertTrue(mp.fixated)
 
+    def test_mutation_method_exception(self):
+        axelrod.seed(10)
+        cycle_length = 5
+        players = [axelrod.EvolvableCycler(cycle_length=cycle_length)
+                   for _ in range(5)]
+        self.assertRaises(ValueError, MoranProcess(players, turns=10, mutation_method="random"))
+
+
 class GraphMoranProcess(unittest.TestCase):
     def test_complete(self):
         """A complete graph should produce the same results as the default

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ def mutate(self):`
`290`	`290`	`)`
`291`	`291`
`292`	`292`	`def crossover(self, other):`
`293`		`- if not isinstance(other, self.__class__):`
	`293`	`+ if other.__class__ != self.__class__:`
`294`	`294`	`raise TypeError("Crossover must be between the same player classes.")`
`295`	`295`	`transitions_C = crossover_lists(self.hmm.transitions_C, other.hmm.transitions_C)`
`296`	`296`	`transitions_D = crossover_lists(self.hmm.transitions_D, other.hmm.transitions_D)`
Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ def mutate(self):`
`500`	`500`	`)`
`501`	`501`
`502`	`502`	`def crossover(self, other):`
`503`		`- if not isinstance(other, self.__class__):`
	`503`	`+ if other.__class__ != self.__class__:`
`504`	`504`	`raise TypeError("Crossover must be between the same player classes.")`
`505`	`505`	`lookup_dict = crossover_dictionaries(self.lookup_dict, other.lookup_dict)`
`506`	`506`	`return self.create_new(lookup_dict=lookup_dict)`