Merge pull request #202 from OpenBioSim/backport_201

Backport fix from PR #201

python/BioSimSpace/Sandpit/Exscientia/Types/_type.py

@@ -388,26 +388,6 @@ def __eq__(self, other):
         else:
             return False
 
-    def __ne__(self, other):
-        """Not equals to operator."""
-
-        # Compare to another object of the same type.
-        if type(other) is type(self):
-            return _math.isclose(
-                self._to_default_unit().value(),
-                other._to_default_unit().value(),
-            )
-
-        # Compare with a string.
-        elif isinstance(other, str):
-            return not _math.isclose(
-                self._to_default_unit().value(),
-                self._from_string(other)._to_default_unit().value(),
-            )
-
-        else:
-            return True
-
     def __ge__(self, other):
         """Greater than or equal to operator."""
 

python/BioSimSpace/Types/_type.py

@@ -388,26 +388,6 @@ def __eq__(self, other):
         else:
             return False
 
-    def __ne__(self, other):
-        """Not equals to operator."""
-
-        # Compare to another object of the same type.
-        if type(other) is type(self):
-            return _math.isclose(
-                self._to_default_unit().value(),
-                other._to_default_unit().value(),
-            )
-
-        # Compare with a string.
-        elif isinstance(other, str):
-            return not _math.isclose(
-                self._to_default_unit().value(),
-                self._from_string(other)._to_default_unit().value(),
-            )
-
-        else:
-            return True
-
     def __ge__(self, other):
         """Greater than or equal to operator."""
 

tests/Sandpit/Exscientia/Types/test_types.py

@@ -134,3 +134,21 @@ def test_container_mul(Type):
 
     # Assert we have a container of the original type.
     assert all(isinstance(x, Type) for x in container)
+
+
+@pytest.mark.parametrize("Type", types)
+def test_operators(Type):
+    """Test equality/inequality operators."""
+
+    t0 = Type(1.0, Type._default_unit)
+    t1 = Type(2.0, Type._default_unit)
+    t2 = Type(3.0, Type._default_unit)
+
+    assert t0 == t0
+    assert t0 <= t0
+    assert t0 >= t0
+    assert t0 != t1
+    assert t0 < t1
+    assert t1 > t0
+    assert t1 < t2
+    assert t2 > t1

tests/Types/test_types.py

@@ -134,3 +134,21 @@ def test_container_mul(Type):
 
     # Assert we have a container of the original type.
     assert all(isinstance(x, Type) for x in container)
+
+
+@pytest.mark.parametrize("Type", types)
+def test_operators(Type):
+    """Test equality/inequality operators."""
+
+    t0 = Type(1.0, Type._default_unit)
+    t1 = Type(2.0, Type._default_unit)
+    t2 = Type(3.0, Type._default_unit)
+
+    assert t0 == t0
+    assert t0 <= t0
+    assert t0 >= t0
+    assert t0 != t1
+    assert t0 < t1
+    assert t1 > t0
+    assert t1 < t2
+    assert t2 > t1