DataSampler: Fix Bootstrap signature

Author: astaric

Orange/widgets/data/owdatasampler.py

@@ -47,7 +47,7 @@ class OWDataSampler(OWWidget):
     selectedFold = Setting(1)
 
     class Warning(OWWidget.Warning):
-        could_not_stratify = Msg("Could not stratify\n{}")
+        could_not_stratify = Msg("Stratification failed\n{}")
 
     class Error(OWWidget.Error):
         too_many_folds = Msg("Number of folds exceeds data size")
@@ -385,7 +385,14 @@ def __init__(self, size=0, random_state=None):
         self.size = size
         self.random_state = random_state
 
-    def __call__(self):
+    def __call__(self, table=None):
+        """Bootstrap indices
+
+        Args:
+            table: Not used (but part of the signature)
+        Returns:
+            tuple (out_of_sample, sample) indices
+        """
         rgen = np.random.RandomState(self.random_state)
         sample = rgen.randint(0, self.size, self.size)
         sample.sort()  # not needed for the code below, just for the user

Orange/widgets/data/tests/test_owdatasampler.py

@@ -12,7 +12,7 @@ def setUpClass(cls):
         cls.iris = Table("iris")
 
     def setUp(self):
-        self.widget = self.create_widget(OWDataSampler)
+        self.widget = self.create_widget(OWDataSampler)  # type: OWDataSampler
 
     def test_error_message(self):
         """ Check if error message appears and then disappears when
@@ -33,3 +33,29 @@ def test_stratified_on_unbalanced_data(self):
         self.widget.controls.stratify.setChecked(True)
         self.send_signal("Data", unbalanced_data)
         self.assertTrue(self.widget.Warning.could_not_stratify.is_shown())
+
+    def test_bootstrap(self):
+        self.select_sampling_type(self.widget.Bootstrap)
+
+        self.send_signal("Data", self.iris)
+
+        in_input = set(self.iris.ids)
+        sample = self.get_output("Data Sample")
+        in_sample = set(sample.ids)
+        in_remaining = set(self.get_output("Remaining Data").ids)
+
+        # Bootstrap should sample len(input) instances
+        self.assertEqual(len(sample), len(self.iris))
+        # Sample and remaining should cover all instances, while none
+        # should be present in both
+        self.assertEqual(len(in_sample | in_remaining), len(in_input))
+        self.assertEqual(len(in_sample & in_remaining), 0)
+        # Sampling with replacement will always produce at least one distinct
+        # instance in sample, and at least one instance in remaining with
+        # high probability (1-(1/150*2/150*...*145/150) ~= 1-2e-64)
+        self.assertGreater(len(in_sample), 0)
+        self.assertGreater(len(in_remaining), 0)
+
+    def select_sampling_type(self, sampling_type):
+        buttons = self.widget.controls.sampling_type.group.buttons()
+        buttons[sampling_type].click()