Merge pull request #402 from robotools/improveFuzzyNumber

add __eq__ and __hash__ to FuzzyNumber

Lib/defcon/test/tools/test_fuzzyNumber.py

@@ -21,7 +21,7 @@ def test_repr(self):
 
     def test_comparison(self):
         fuzzyNumber1 = FuzzyNumber(value=0, threshold=1)
-        # self.assertEqual(fuzzyNumber1, 0)
+        self.assertEqual(fuzzyNumber1, 0)
         self.assertTrue(fuzzyNumber1 < 1)
         self.assertFalse(fuzzyNumber1 < -0.000001)
         self.assertFalse(fuzzyNumber1 < 0)
@@ -53,3 +53,18 @@ def test_comparison(self):
             "[[-1.000000 1.000000], [0.000000 1.000000]]"
         )
         self.assertTrue(fuzzyNumber1 > fuzzyNumber2)
+
+        # equal
+        self.assertEqual(fuzzyNumber1, fuzzyNumber1)
+        self.assertNotEqual(fuzzyNumber1, fuzzyNumber2)
+
+        # complex sorting
+        fuzzyNumber2 = FuzzyNumber(value=0.999999, threshold=1)
+        self.assertEqual(
+            repr(sorted([(fuzzyNumber1, 20), (fuzzyNumber2, 10)])),
+            "[([0.999999 1.000000], 10), ([0.000000 1.000000], 20)]"
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()

Lib/defcon/tools/fuzzyNumber.py

@@ -14,3 +14,11 @@ def __lt__(self, other):
             else:
                 return self.value < other.value
         return self.value < other
+
+    def __eq__(self, other):
+        if hasattr(other, "value"):
+            return abs(self.value - other.value) < self.threshold
+        return self.value == other
+
+    def __hash__(self):
+        return hash((self.value, self.threshold))