Merge pull request #4902 from aturanjanin/owsom

SOM: data info displayed in the status bar

Author: VesnaT

Orange/widgets/unsupervised/owsom.py

@@ -22,6 +22,7 @@
     DomainContextHandler, ContextSetting, Setting
 from Orange.widgets.utils.itemmodels import DomainModel
 from Orange.widgets.utils.widgetpreview import WidgetPreview
+from Orange.widgets.utils.state_summary import format_summary_details
 from Orange.widgets.utils.annotated_data import \
     create_annotated_table, create_groups_table, ANNOTATED_DATA_SIGNAL_NAME
 from Orange.widgets.utils.colorpalettes import \
@@ -229,6 +230,9 @@ def __init__(self):
         self.selection = None
         self.colors = self.thresholds = self.bin_labels = None
 
+        self._set_input_summary(None)
+        self._set_output_summary(None)
+
         box = gui.vBox(self.controlArea, box="SOM")
         shape = gui.comboBox(
             box, self, "", items=("Hexagonal grid", "Square grid"))
@@ -353,25 +357,18 @@ def set_warnings():
         self.set_color_bins()
         self.create_legend()
         self.recompute_dimensions()
-        self._set_input_summary(data and len(data))
+        self._set_input_summary(data)
         self.start_som()
 
-    def _set_input_summary(self, n_tot):
-        if self.data is None:
-            self.info.set_input_summary(self.info.NoInput)
-            return
-
-        n = len(self.data)
-        inst = str(n)
-        nvars = f"{self.cont_x.shape[1]} numeric variables"
-        if n < n_tot:
-            inst += f" ({n_tot})"
-            details = f"{n_tot - n} out of {n_tot} instances ignored " \
-                      f"because of missing values;\n{nvars}"
-        else:
-            details = f"{n} instances; {nvars}"
+    def _set_input_summary(self, data):
+        summary = len(data) if data else self.info.NoInput
+        details = format_summary_details(data) if data else ""
+        self.info.set_input_summary(summary, details)
 
-        self.info.set_input_summary(inst, details)
+    def _set_output_summary(self, output):
+        summary = len(output) if output else self.info.NoOutput
+        details = format_summary_details(output) if output else ""
+        self.info.set_output_summary(summary, details)
 
     def clear(self):
         self.data = self.cont_x = None
@@ -807,7 +804,7 @@ def update_output(self):
         if self.data is None:
             self.Outputs.selected_data.send(None)
             self.Outputs.annotated_data.send(None)
-            self.info.set_output_summary(self.info.NoOutput)
+            self._set_output_summary(None)
             return
 
         indices = np.zeros(len(self.data), dtype=int)
@@ -820,10 +817,10 @@ def update_output(self):
         if np.any(indices):
             sel_data = create_groups_table(self.data, indices, False, "Group")
             self.Outputs.selected_data.send(sel_data)
-            self.info.set_output_summary(str(len(sel_data)))
+            self._set_output_summary(sel_data)
         else:
             self.Outputs.selected_data.send(None)
-            self.info.set_output_summary(self.info.NoOutput)
+            self._set_output_summary(None)
 
         if np.max(indices) > 1:
             annotated = create_groups_table(self.data, indices)

Orange/widgets/unsupervised/tests/test_owsom.py

@@ -9,6 +9,7 @@
 from Orange.data import Table, Domain
 from Orange.widgets.tests.base import WidgetTest
 from Orange.widgets.utils.annotated_data import ANNOTATED_DATA_FEATURE_NAME
+from Orange.widgets.utils.state_summary import format_summary_details
 from Orange.widgets.unsupervised.owsom import OWSOM, SomView, SOM
 
 
@@ -508,6 +509,11 @@ def test_on_selection_change_on_empty(self):
     def test_output(self):
         widget = self.widget
         self.send_signal(self.widget.Inputs.data, self.iris)
+        summary, details = f"{len(self.iris)}", format_summary_details(
+            self.iris)
+        self.assertEqual(widget.info._StateInfo__input_summary.brief, summary)
+        self.assertEqual(widget.info._StateInfo__input_summary.details,
+                         details)
 
         self.assertIsNone(self.get_output(widget.Outputs.selected_data))
         out = self.get_output(widget.Outputs.annotated_data)
@@ -520,6 +526,10 @@ def test_output(self):
         widget.on_selection_change(m)
         out = self.get_output(widget.Outputs.selected_data)
         np.testing.assert_equal(out.ids, self.iris.ids[:30])
+        summary, details = f"{len(out)}", format_summary_details(out)
+        self.assertEqual(widget.info._StateInfo__output_summary.brief, summary)
+        self.assertEqual(widget.info._StateInfo__output_summary.details,
+                         details)
 
         out = self.get_output(widget.Outputs.annotated_data)
         np.testing.assert_equal(
@@ -540,6 +550,12 @@ def test_output(self):
         self.send_signal(self.widget.Inputs.data, None)
         self.assertIsNone(self.get_output(widget.Outputs.selected_data))
         self.assertIsNone(self.get_output(widget.Outputs.annotated_data))
+        self.assertEqual(widget.info._StateInfo__input_summary.brief, "")
+        self.assertEqual(widget.info._StateInfo__input_summary.details,
+                         "No data on input")
+        self.assertEqual(widget.info._StateInfo__output_summary.brief, "")
+        self.assertEqual(widget.info._StateInfo__output_summary.details,
+                         "No data on output")
 
 
 if __name__ == "__main__":