fixed __eq__ testing

Author: cx1111

tests/test_records.py

@@ -17,7 +17,6 @@ def test_1(self):
         # This comment line was manually added and is not present in the original physiobank record
         del(fields['comments'][0])
 
-        # Test file writing
         assert np.array_equal(siground, targetsig)
         assert np.array_equal(sig, pbsig) and fields == pbfields
 
@@ -38,7 +37,7 @@ def test_2(self):
 
         # Test file writing
         record.wrsamp()
-        recordwrite = wfdb.rdsamp('100')
+        recordwrite = wfdb.rdsamp('100', physical=False)
 
         assert np.array_equal(sig, targetsig)
         assert record.__eq__(pbrecord)
@@ -95,7 +94,7 @@ def test_5(self):
 
         # Test file writing
         record.wrsamp()
-        recordwrite = wfdb.rdsamp('a103l')
+        recordwrite = wfdb.rdsamp('a103l', physical=False)
 
         assert np.array_equal(sig, targetsig)
         assert record.__eq__(pbrecord)

wfdb/annotations.py

@@ -55,22 +55,22 @@ def __eq__(self, other):
         att2 = other.__dict__
 
         if set(att1.keys()) != set(att2.keys()):
-            return False, 1
+            return False
 
         for k in att1.keys():
             v1 = att1[k]
             v2 = att2[k]
 
             if type(v1) != type(v2):
-                return False, 2
+                return False
 
             if type(v1) == np.ndarray:
                 if not np.array_equal(v1, v2):
-                    return False, 3
+                    return False
             else:
                 if v1 != v2:
                     print(k)
-                    return False, 4
+                    return False
 
         return True
 

wfdb/records.py

@@ -360,21 +360,22 @@ def __eq__(self, other):
         att2 = other.__dict__
 
         if set(att1.keys()) != set(att2.keys()):
-            return False, 1
+            return False
 
         for k in att1.keys():
+
             v1 = att1[k]
             v2 = att2[k]
 
             if type(v1) != type(v2):
-                return False, 2
+                return False
 
             if type(v1) == np.ndarray:
                 if not np.array_equal(v1, v2):
-                    return False, 3
+                    return False
             else:
                 if v1 != v2:
-                    return False, 4
+                    return False
 
         return True