Skip to content

[ENH] Parameter Fitter: more responsive when changing settings #7027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markotoplak merged 3 commits into from
Feb 21, 2025
Merged

[ENH] Parameter Fitter: more responsive when changing settings #7027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e682dd
Parameter Fitter: more responsive when changing settings
markotoplak Feb 12, 2025
8be7cbc
test_owparameterfitter: try to make tests faster
markotoplak Feb 13, 2025
b32d0ce
remove needless callback
markotoplak Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions Orange/widgets/evaluate/owparameterfitter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from Orange.evaluation import CrossValidation, TestOnTrainingData, Results
from Orange.evaluation.scoring import Score, AUC, R2
from Orange.modelling import Fitter
from Orange.util import dummy_callback
from Orange.util import dummy_callback, wrap_callback
from Orange.widgets import gui
from Orange.widgets.settings import Setting
from Orange.widgets.utils import userinput
Expand All @@ -42,12 +42,19 @@
def _validate(
data: Table,
learner: Learner,
scorer: type[Score]
scorer: type[Score],
progress_callback: Callable
) -> tuple[float, float]:
res: Results = TestOnTrainingData()(data, [learner],
suppresses_exceptions=False)
suppresses_exceptions=False,
callback=wrap_callback(
progress_callback, 0, 1/(1+N_FOLD))
)
res_cv: Results = CrossValidation(k=N_FOLD)(data, [learner],
suppresses_exceptions=False)
suppresses_exceptions=False,
callback=wrap_callback(
progress_callback, 1/(1+N_FOLD), 1.)
)
# pylint: disable=unsubscriptable-object
return scorer(res)[0], scorer(res_cv)[0]

Expand All @@ -65,10 +72,10 @@ def _search(
scorer = AUC if data.domain.has_discrete_class else R2
name = fitted_parameter_props.name
for i, value in enumerate(steps):
progress_callback(i / len(steps))
params = initial_parameters.copy()
params[name] = value
result = _validate(data, type(learner)(**params), scorer)
result = _validate(data, type(learner)(**params), scorer,
wrap_callback(progress_callback, i / len(steps), (i+1) / len(steps)))
scores.append((value, result))
return scores, scorer.name, fitted_parameter_props.label

Expand Down
28 changes: 14 additions & 14 deletions Orange/widgets/evaluate/tests/test_owparameterfitter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,11 @@ def check(cases):
def test_steps_preview(self):
self.send_signal(self.widget.Inputs.data, self._housing)
self.send_signal(self.widget.Inputs.learner, self._pls)
self.wait_until_finished()
self.widget.cancel()
self.assertEqual(self.widget.range_preview.steps(), (1, 2))

self.widget.controls.type.buttons[1].click()
self.wait_until_finished()
self.widget.cancel()
self.assertIsNone(self.widget.range_preview.steps())

def test_on_parameter_changed(self):
Expand Down Expand Up @@ -283,11 +283,11 @@ def test_initial_parameters(self):

self.send_signal(self.widget.Inputs.learner, self._pls)
self.assertEqual(len(self.widget.initial_parameters), 3)
self.wait_until_finished()
self.widget.cancel()

self.send_signal(self.widget.Inputs.learner, self._rf)
self.assertEqual(len(self.widget.initial_parameters), 13)
self.wait_until_finished()
self.widget.cancel()

self.send_signal(self.widget.Inputs.data, None)
self.assertEqual(len(self.widget.initial_parameters), 14)
Expand All @@ -297,32 +297,32 @@ def test_initial_parameters(self):

def test_bounds(self):
self.widget.controls.minimum.setValue(-3)
self.widget.controls.maximum.setValue(6)
self.widget.controls.maximum.setValue(2)
self.send_signal(self.widget.Inputs.learner, self._pls)
self.send_signal(self.widget.Inputs.data, self._housing)
self.send_signal(self.widget.Inputs.learner, None)
self.widget.controls.minimum.setValue(-3)
self.widget.controls.maximum.setValue(6)
self.widget.controls.maximum.setValue(2)
self.send_signal(self.widget.Inputs.learner, self._pls)
self.wait_until_finished()
self.assertFalse(self.widget.Error.unknown_err.is_shown())

def test_saved_workflow(self):
self.send_signal(self.widget.Inputs.data, self._housing)
self.send_signal(self.widget.Inputs.learner, self._dummy)
self.wait_until_finished()
self.widget.cancel()
simulate.combobox_activate_index(
self.widget.controls.parameter_index, 2)
self.widget.controls.minimum.setValue(3)
self.widget.controls.maximum.setValue(6)
self.wait_until_finished()
self.widget.cancel()

settings = self.widget.settingsHandler.pack_data(self.widget)
widget = self.create_widget(OWParameterFitter,
stored_settings=settings)
self.send_signal(widget.Inputs.data, self._housing, widget=widget)
self.send_signal(widget.Inputs.learner, self._dummy, widget=widget)
self.wait_until_finished(widget=widget)
widget.cancel()
self.assertEqual(widget.controls.parameter_index.currentText(), "Baz")
self.assertEqual(widget.minimum, 3)
self.assertEqual(widget.maximum, 6)
Expand Down Expand Up @@ -538,12 +538,12 @@ def check(cases):
w: OWParameterFitter = self.widget
self.send_signal(w.Inputs.data, self._housing)
self.send_signal(w.Inputs.learner, self._dummy)
self.wait_until_finished()
self.widget.cancel()
w.type = w.MANUAL

# No limits
simulate.combobox_activate_index(w.controls.parameter_index, 3)
self.wait_until_finished()
self.widget.cancel()
check([("1, 2, ..., 5", (1, 2, 3, 4, 5)),
("1, 2, 3, ..., 5, 6, 7", (1, 2, 3, 4, 5, 6, 7)),
("3, ..., 5, 6", (3, 4, 5, 6)),
Expand All @@ -555,7 +555,7 @@ def check(cases):

# 5 to 10
simulate.combobox_activate_index(w.controls.parameter_index, 1)
self.wait_until_finished()
self.widget.cancel()
check([("4, 5, ..., 8", ()),
("5, 6, ..., 12", ()),
("5, 6, ..., 9", (5, 6, 7, 8, 9)),
Expand All @@ -569,7 +569,7 @@ def check(cases):

# 5 to None
simulate.combobox_activate_index(w.controls.parameter_index, 0)
self.wait_until_finished()
self.widget.cancel()
check([("4, 5, ..., 8", ()),
("5, 6, ..., 12", (5, 6, 7, 8, 9, 10, 11, 12)),
("6, 7, ..., 9", (6, 7, 8, 9)),
Expand All @@ -580,7 +580,7 @@ def check(cases):

# None to 10
simulate.combobox_activate_index(w.controls.parameter_index, 2)
self.wait_until_finished()
self.widget.cancel()
check([("4, 5, ..., 8", (4, 5, 6, 7, 8)),
("5, 6, ..., 12", ()),
("5, 6, ..., 9", (5, 6, 7, 8, 9)),
Expand Down