Fix ResultSet __eq__ to handle nans (again)

Author: gaffney2010

axelrod/result_set.py

@@ -2,6 +2,7 @@
 import csv
 import itertools
 from multiprocessing import cpu_count
+from typing import List
 import warnings
 
 import numpy as np
@@ -611,6 +612,18 @@ def __eq__(self, other):
             other : axelrod.ResultSet
                 Another results set against which to check equality
         """
+
+        def list_equal_with_nans(v1: List[float], v2: List[float]) -> bool:
+            """Matches lists, accounting for NaNs."""
+            if len(v1) != len(v2):
+                return False
+            for i1, i2 in zip(v1, v2):
+                if np.isnan(i1) and np.isnan(i2):
+                    continue
+                if i1 != i2:
+                    return False
+            return True
+
         return all(
             [
                 self.wins == other.wins,

axelrod/tests/unit/test_eigen.py

@@ -15,6 +15,13 @@ def test_identity_matrices(self):
             self.assertAlmostEqual(evalue, 1)
             assert_array_almost_equal(evector, _normalise(numpy.ones(size)))
 
+    def test_zero_matrix(self):
+        mat = numpy.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]))
+
     def test_2x2_matrix(self):
         mat = numpy.array([[2, 1], [1, 2]])
         evector, evalue = principal_eigenvector(mat)

axelrod/tests/unit/test_resultset.py

@@ -7,7 +7,7 @@
 import pandas as pd
 from axelrod.result_set import create_counter_dict
 from axelrod.tests.property import prob_end_tournaments, tournaments
-from numpy import mean, nanmedian, std
+from numpy import mean, nan, nanmedian, std
 
 from dask.dataframe.core import DataFrame
 from hypothesis import given, settings