fix module __eq__

ahalev · May 13, 2023 · b6f7a88 · b6f7a88
1 parent 4cbed1b
commit b6f7a88
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/src/pymgrid/modules/base/base_module.py b/src/pymgrid/modules/base/base_module.py
@@ -1009,8 +1009,23 @@ def __eq__(self, other):
         if type(self) != type(other):
             return NotImplemented
 
-        diff = [(k1, v1, v2) for (k1, v1), (k2, v2) in zip(self.__dict__.items(), other.__dict__.items()) if
-                ((hasattr(v1, "any") and not np.allclose(v1, v2)) or (not hasattr(v1, "any") and v1 != v2))]
+        def are_equal(v1, v2):
+            try:
+                _are_equal = bool(v1 == v2)
+                if _are_equal:
+                    return True
+            except ValueError:
+                pass
+
+            try:
+                return np.allclose(v1, v2)
+            except (ValueError, TypeError):
+                return False
+
+        diff = [
+            (k1, v1, v2) for (k1, v1), (k2, v2) in zip(self.__dict__.items(), other.__dict__.items())
+            if not are_equal(v1, v2)
+        ]
 
         return len(diff) == 0