Merge pull request #5481 from VesnaT/curve_fit

[ENH] Curve Fit: New widget

Author: lanzagar

Orange/data/tests/test_util.py

@@ -3,7 +3,7 @@
 
 from Orange.data import Domain, ContinuousVariable
 from Orange.data.util import get_unique_names, get_unique_names_duplicates, \
-    get_unique_names_domain, one_hot
+    get_unique_names_domain, one_hot, sanitized_name
 
 
 class TestGetUniqueNames(unittest.TestCase):
@@ -260,5 +260,13 @@ def test_dim_too_low(self):
             one_hot(self.values, dim=2)
 
 
+class TestSanitizedName(unittest.TestCase):
+    def test_sanitized_name(self):
+        self.assertEqual(sanitized_name("Foo"), "Foo")
+        self.assertEqual(sanitized_name("Foo Bar"), "Foo_Bar")
+        self.assertEqual(sanitized_name("0Foo"), "_0Foo")
+        self.assertEqual(sanitized_name("1 Foo Bar"), "_1_Foo_Bar")
+
+
 if __name__ == "__main__":
     unittest.main()

Orange/data/util.py

@@ -268,3 +268,19 @@ def get_unique_names_domain(attributes, class_vars=(), metas=()):
                                  for old, new in zip(all_names, unique_names)
                                  if new != old))
     return (attributes, class_vars, metas), renamed
+
+
+def sanitized_name(name: str) -> str:
+    """
+    Replace non-alphanumeric characters and leading zero with `_`.
+
+    Args:
+        name (str): proposed name
+
+    Returns:
+        name (str): new name
+    """
+    sanitized = re.sub(r"\W", "_", name)
+    if sanitized[0].isdigit():
+        sanitized = "_" + sanitized
+    return sanitized

Orange/regression/__init__.py

@@ -1,5 +1,5 @@
 # Pull members from modules to Orange.regression namespace
-# pylint: disable=wildcard-import
+# pylint: disable=wildcard-import,broad-except
 
 from .base_regression import (ModelRegression as Model,
                               LearnerRegression as Learner,
@@ -23,3 +23,4 @@
     from .xgb import *
 except Exception:
     pass
+from .curvefit import *