Always convert weights to floats on assignment.

biolab · sstanovnik · Jun 10, 2016 · Jun 17, 2016 · Jun 17, 2016 · Jun 22, 2016
commit 259bfc11f01e1f3a7a4d9a35e9168c5ba8a42407
diff --git a/Orange/data/table/base.py b/Orange/data/table/base.py
@@ -707,12 +707,13 @@ def weights(self):
             result = np.atleast_1d(self[self._WEIGHTS_COLUMN])
         else:
             result = self[self._WEIGHTS_COLUMN].values
-        # even if weights are set with an integer, we need to return a float
-        return result.astype(float)
+        return result
 
     def set_weights(self, weight):
         """Set the weights for the instances in this table.
 
+        Weights are always cast to floats, even if integers are passed.
+
         Parameters
         ----------
         weight : Number or str or Sequence or np.ndarray or pd.Series
@@ -741,7 +742,9 @@ def set_weights(self, weight):
         else:
             raise TypeError("Expected one of [Number, str, Sequence, SeriesBase].")
 
-        if not isinstance(weights, Number):
+        if isinstance(weights, Number):
+            weights = float(weights)
+        else:
             weights = np.ravel(weights)
             if len(weights) != len(self):
                 raise ValueError("The sequence has length {}, expected length {}.".format(len(weights), len(self)))
@@ -876,7 +879,7 @@ def __setitem__(self, key, value):
             new_id = self._new_id(len(self), force_list=True)
             self.index = new_id
             # super call because we'd otherwise recurse back into this
-            super().__setitem__(self._WEIGHTS_COLUMN, 1)
+            super().__setitem__(self._WEIGHTS_COLUMN, 1.0)
 
     def __str__(self):
         """Augment the pandas representation to provide a more Orange-friendly one.