Merge pull request #1995 from VesnaT/fix_ds

[FIX] OWDataSampler: Fix 'Fixed proportion of data' option

Author: markotoplak

Orange/widgets/data/owdatasampler.py

@@ -377,7 +377,8 @@ def __init__(self, p=0, stratified=False, random_state=None):
 
     def __call__(self, table):
         n = int(math.ceil(len(table) * self.p))
-        return SampleRandomN(n, self.stratified, self.random_state)(table)
+        return SampleRandomN(n, self.stratified,
+                             random_state=self.random_state)(table)
 
 
 class SampleBootstrap(Reprable):

Orange/widgets/data/tests/test_owdatasampler.py

@@ -10,6 +10,7 @@ class TestOWDataSampler(WidgetTest):
     def setUpClass(cls):
         super().setUpClass()
         cls.iris = Table("iris")
+        cls.zoo = Table("zoo")
 
     def setUp(self):
         self.widget = self.create_widget(OWDataSampler)  # type: OWDataSampler
@@ -59,3 +60,27 @@ def test_bootstrap(self):
     def select_sampling_type(self, sampling_type):
         buttons = self.widget.controls.sampling_type.group.buttons()
         buttons[sampling_type].click()
+
+    def test_no_intersection_in_outputs(self):
+        """ Check whether outputs intersect and whether length of outputs sums
+        to length of original data """
+        self.send_signal("Data", self.zoo)
+        w = self.widget
+        sampling_types = [w.FixedProportion, w.FixedSize, w.CrossValidation]
+
+        for replicable in [True, False]:
+            for stratified in [True, False]:
+                for sampling_type in sampling_types:
+                    self.widget.cb_seed.setChecked(replicable)
+                    self.widget.cb_stratify.setChecked(stratified)
+                    self.select_sampling_type(sampling_type)
+                    self.widget.commit()
+
+                    sample = self.get_output("Data Sample")
+                    other = self.get_output("Remaining Data")
+                    self.assertEqual(len(self.zoo), len(sample) + len(other))
+                    self.assertNoIntersection(sample, other)
+
+    def assertNoIntersection(self, sample, other):
+        for inst in sample:
+            self.assertNotIn(inst, other)