Merge pull request #6652 from ales-erjavec/fixes/owrules-effective-model-name

[FIX] CN2 Rule Induction: Fix model's effective name

Author: janezd

Orange/widgets/model/owneuralnetwork.py

@@ -281,7 +281,7 @@ def _task_finished(self, f):
             self.model = None
             self.show_fitting_failed(ex)
         else:
-            self.model.name = self.learner_name
+            self.model.name = self.effective_learner_name()
             self.model.instances = self.data
             self.model.skl_model.orange_callback = None  # remove unpicklable callback
             self.Outputs.model.send(self.model)

Orange/widgets/model/owrules.py

@@ -328,7 +328,7 @@ def update_model(self):
             except MemoryError:
                 self.Error.out_of_memory()
             else:
-                self.model.name = self.learner_name
+                self.model.name = self.effective_learner_name()
                 self.model.instances = self.data
                 self.valid_data = True
         self.Outputs.model.send(self.model)

Orange/widgets/tests/base.py

@@ -362,11 +362,14 @@ def test_output_learner_name(self):
     def test_output_model_name(self):
         """Check if model's name properly changes"""
         new_name = "Model Name"
-        self.widget.name_line_edit.setText(new_name)
         self.send_signal(self.widget.Inputs.data, self.data)
         self.click_apply()
-        self.wait_until_stop_blocking()
-        self.assertEqual(self.get_output(self.widget.Outputs.model).name, new_name)
+        self.assertEqual(self.get_output(self.widget.Outputs.model).name,
+                         self.widget.effective_learner_name())
+        self.widget.name_line_edit.setText(new_name)
+        self.click_apply()
+        self.assertEqual(self.get_output(self.widget.Outputs.model).name,
+                         new_name)
 
     def test_output_model_picklable(self):
         """Check if model can be pickled"""

Orange/widgets/utils/owlearnerwidget.py

@@ -234,7 +234,7 @@ def update_model(self):
             except BaseException as exc:
                 self.show_fitting_failed(exc)
             else:
-                self.model.name = self.learner_name or self.captionTitle
+                self.model.name = self.effective_learner_name()
                 self.model.instances = self.data
         self._send_model()