Run black on changed files

Author: gaffney2010

axelrod/result_set.py

@@ -426,7 +426,9 @@ def _build_initial_cooperation_rate(self, interactions_series):
         with warnings.catch_warnings():
             warnings.simplefilter("ignore")
             initial_cooperation_rate = list(
-                np.nan_to_num(np.array(self.initial_cooperation_count) / interactions_array)
+                np.nan_to_num(
+                    np.array(self.initial_cooperation_count) / interactions_array
+                )
             )
             return initial_cooperation_rate
 
@@ -628,8 +630,8 @@ def __eq__(self, other):
                 self.cooperating_rating == other.cooperating_rating,
                 self.good_partner_matrix == other.good_partner_matrix,
                 self.good_partner_rating == other.good_partner_rating,
-                self.eigenmoses_rating == other.eigenmoses_rating,
-                self.eigenjesus_rating == other.eigenjesus_rating,
+                list_equal_with_nans(self.eigenmoses_rating, other.eigenmoses_rating),
+                list_equal_with_nans(self.eigenjesus_rating, other.eigenjesus_rating),
             ]
         )
 

axelrod/tests/unit/test_resultset.py

@@ -190,6 +190,36 @@ def test_init(self):
         self.assertEqual(rs.players, self.players)
         self.assertEqual(rs.num_players, len(self.players))
 
+    def _clear_matrix(self, matrix):
+        for i in range(len(matrix)):
+            for j in range(len(matrix[i])):
+                matrix[i][j] = 0
+
+    def test_ne_vectors(self):
+        rs_1 = axelrod.ResultSet(self.filename, self.players, self.repetitions)
+
+        rs_2 = axelrod.ResultSet(self.filename, self.players, self.repetitions)
+
+        # A different vector
+        rs_2.eigenmoses_rating = (-1, -1, -1)
+
+        self.assertNotEqual(rs_1, rs_2)
+
+    def test_nan_vectors(self):
+        rs_1 = axelrod.ResultSet(self.filename, self.players, self.repetitions)
+        # Force a broken eigenmoses, by replacing vengeful_cooperation with
+        # zeroes.
+        self._clear_matrix(rs_1.vengeful_cooperation)
+        rs_1.eigenmoses_rating = rs_1._build_eigenmoses_rating()
+
+        rs_2 = axelrod.ResultSet(self.filename, self.players, self.repetitions)
+        # Force a broken eigenmoses, by replacing vengeful_cooperation with
+        # zeroes.
+        self._clear_matrix(rs_2.vengeful_cooperation)
+        rs_2.eigenmoses_rating = rs_2._build_eigenmoses_rating()
+
+        self.assertEqual(rs_1, rs_2)
+
     def test_init_multiprocessing(self):
         rs = axelrod.ResultSet(
             self.filename,