Weight setting robustness.

biolab · sstanovnik · Jun 10, 2016 · Jun 17, 2016 · Jun 17, 2016 · Jun 22, 2016
commit 2bfca357060f113d45b96be70ff92ce75b535706
diff --git a/Orange/data/table/base.py b/Orange/data/table/base.py
@@ -729,19 +729,21 @@ def set_weights(self, weight):
             if weight not in self.columns:
                 raise ValueError("{!r} is not a column.".format(weight))
             weights = self[weight].values
-        elif isinstance(weight, (np.ndarray, Sequence)):
+        elif isinstance(weight, (np.ndarray, Sequence, pd.Categorical)):
             weights = np.asanyarray(weight)
         elif isinstance(weight, pd.Series):
             weights = weight.values
-        elif isinstance(weight, pd.Categorical):
-            weights = np.asanyarray(weight)
         else:
             raise TypeError("Expected one of [Number, str, Sequence, SeriesBase].")
 
         if not isinstance(weights, Number):
             weights = np.ravel(weights)
             if len(weights) != len(self):
                 raise ValueError("The sequence has length {}, expected length {}.".format(len(weights), len(self)))
+            try:
+                weights = np.asanyarray(weights, dtype=float)
+            except ValueError:
+                raise ValueError("Weight values must be numbers or convertible to numbers") from None
 
         if bn.anynan(weights):
             raise ValueError("Weights cannot be nan.")