Merge pull request #2003 from kernc/repr-pr

util.Reprable: more generic equals (handle array_like types)

Author: astaric

Orange/tests/test_util.py

@@ -33,6 +33,19 @@ def test_try_(self):
         self.assertFalse(try_(lambda: np.whatever()))
         self.assertEqual(try_(len, default=SOMETHING), SOMETHING)
 
+    def test_reprable(self):
+        from Orange.data import ContinuousVariable
+        from Orange.preprocess.impute import ReplaceUnknownsRandom
+        from Orange.statistics.distribution import Continuous
+
+        var = ContinuousVariable('x')
+        transform = ReplaceUnknownsRandom(var, Continuous(1, var))
+
+        self.assertEqual(repr(transform).replace('\n       ', ' '),
+                         "ReplaceUnknownsRandom("
+                         "variable=ContinuousVariable(name='x', number_of_decimals=3), "
+                         "distribution=Continuous([[ 0.], [ 0.]]))")
+
     def test_deepgetattr(self):
         class a:
             l = []

Orange/util.py

@@ -8,6 +8,8 @@
 from collections import OrderedDict
 import warnings
 
+import numpy as np
+
 # Exposed here for convenience. Prefer patching to try-finally blocks
 from unittest.mock import patch  # pylint: disable=unused-import
 
@@ -234,7 +236,7 @@ def __repr__(self):
                     param.kind not in (param.VAR_POSITIONAL,
                                        param.VAR_KEYWORD)):
                     value = getattr(self, param.name)
-                    if value != param.default:
+                    if not self.__equal(value, param.default):
                         names_values.append((param.name, value))
 
         module = self._reprable_module
@@ -246,6 +248,17 @@ def __repr__(self):
                                  ', '.join('{}={!r}'.format(*pair)
                                            for pair in names_values))
 
+    @staticmethod
+    def __equal(obj1, obj2):
+        try:
+            # If the objects are broadcastable (works for array_like as
+            # for arbitrary objects), compare them for equality (possibly
+            # element-wise)
+            return np.broadcast(obj1, obj2) and np.all(obj1 == obj2)
+        except ValueError:
+            # Broadcasting failed
+            return False
+
 
 # For best result, keep this at the bottom
 __all__ = export_globals(globals(), __name__)