Merge Data: Editorial changes

Author: janezd

Orange/widgets/data/owmergedata.py

@@ -202,7 +202,8 @@ def decode_pair(widget, pair):
     def _encode_domain(self, domain):
         if domain is None:
             return {}
-        return dict(self.encode_variables(chain(domain.variables, domain.metas)))
+        all_vars = chain(domain.variables, domain.metas)
+        return dict(self.encode_variables(all_vars))
 
     def settings_from_widget(self, widget, *_args):
         context = widget.current_context
@@ -315,10 +316,9 @@ def __init__(self):
         self.extra_model = DomainModelWithTooltips(content)
 
         box = gui.hBox(self.controlArea, box=None)
-        self.infoBoxData = gui.label(
-            box, self, self.dataInfoText(None), box="Data")
-        self.infoBoxExtraData = gui.label(
-            box, self, self.dataInfoText(None), box="Extra Data")
+        no_info = self.data_info(None)
+        self.info_box_data = gui.label(box, self, no_info, box="Data")
+        self.info_box_extra_data = gui.label(box, self, no_info, box="Extra Data")
 
         grp = gui.radioButtons(
             self.controlArea, self, "merging", box="Merging",
@@ -341,49 +341,19 @@ def __init__(self):
     def change_merging(self):
         self.commit()
 
-    @staticmethod
-    def _try_set_combo(combo, var):
-        if var in combo.model():
-            combo.setCurrentIndex(combo.model().indexOf(var))
-        else:
-            combo.setCurrentIndex(0)
-
-    def _find_best_match(self):
-        def get_unique_str_metas_names(model_):
-            return [m for m in model_ if isinstance(m, StringVariable)]
-
-        attr, extra_attr, n_max_intersect = INDEX, INDEX, 0
-        str_metas = get_unique_str_metas_names(self.model)
-        extra_str_metas = get_unique_str_metas_names(self.extra_model)
-        for m_a, m_b in product(str_metas, extra_str_metas):
-            col = self.data[:, m_a].metas
-            extra_col = self.extra_data[:, m_b].metas
-            if col.size and extra_col.size \
-                    and isinstance(col[0][0], str) \
-                    and isinstance(extra_col[0][0], str):
-                n_inter = len(np.intersect1d(col, extra_col))
-                if n_inter > n_max_intersect:
-                    n_max_intersect, attr, extra_attr = n_inter, m_a, m_b
-        return attr, extra_attr
-
     @Inputs.data
     @check_sql_input
-    def setData(self, data):
+    def set_data(self, data):
         self.data = data
         self.model.set_domain(data and data.domain)
-        self.infoBoxData.setText(self.dataInfoText(data))
+        self.info_box_data.setText(self.data_info(data))
 
     @Inputs.extra_data
     @check_sql_input
-    def setExtraData(self, data):
+    def set_extra_data(self, data):
         self.extra_data = data
         self.extra_model.set_domain(data and data.domain)
-        self.infoBoxExtraData.setText(self.dataInfoText(data))
-
-    def _restore_combo_current_items(self, side, prev_settings):
-        for row, pair in zip(self.attr_boxes.rows, prev_settings):
-            self._try_set_combo(
-                [row.left_combo, row.right_combo][side], pair[side])
+        self.info_box_extra_data.setText(self.data_info(data))
 
     def store_combo_state(self):
         self.attr_pairs = self.attr_boxes.current_state()
@@ -396,8 +366,26 @@ def handleNewSignals(self):
         self.attr_boxes.set_state(self.attr_pairs)
         self.unconditional_commit()
 
+    def _find_best_match(self):
+        def get_unique_str_metas_names(model_):
+            return [m for m in model_ if isinstance(m, StringVariable)]
+
+        attr, extra_attr, n_max_intersect = INDEX, INDEX, 0
+        str_metas = get_unique_str_metas_names(self.model)
+        extra_str_metas = get_unique_str_metas_names(self.extra_model)
+        for m_a, m_b in product(str_metas, extra_str_metas):
+            col = self.data[:, m_a].metas
+            extra_col = self.extra_data[:, m_b].metas
+            if col.size and extra_col.size \
+                    and isinstance(col[0][0], str) \
+                    and isinstance(extra_col[0][0], str):
+                n_inter = len(np.intersect1d(col, extra_col))
+                if n_inter > n_max_intersect:
+                    n_max_intersect, attr, extra_attr = n_inter, m_a, m_b
+        return attr, extra_attr
+
     @staticmethod
-    def dataInfoText(data):
+    def data_info(data):
         if data is None:
             return "No data."
         else:
@@ -408,7 +396,7 @@ def dataInfoText(data):
 
     def commit(self):
         self.clear_messages()
-        merged = None if not self.data or not self.extra_data else self.merge()
+        merged = self.merge() if self.data and self.extra_data else None
         self.Outputs.data.send(merged)
 
     def send_report(self):
@@ -692,6 +680,7 @@ def mig_value(x):
         if hasattr(settings, "attr_pairs"):
             del settings["attr_pairs"]
 
+
 if __name__ == "__main__":  # pragma: no cover
     WidgetPreview(OWMergeData).run(
         setData=Orange.data.Table("tests/data-gender-region"),

Orange/widgets/data/tests/test_owmergedata.py

@@ -288,6 +288,35 @@ def test_retrieve_settings(self):
             widget2.attr_boxes.current_state(),
             [(INDEX, INDEX), (INSTANCEID, INSTANCEID), (var0, var1)])
 
+    def test_match_settings(self):
+        widget = self.widget
+        boxes = widget.attr_boxes
+        domainA = self.dataA.domain
+        domainB = self.dataB.domain
+
+        self.send_signal(widget.Inputs.data, self.dataA)
+        self.send_signal(widget.Inputs.extra_data, self.dataA)
+        attr_pairs = [(INDEX, INDEX), (INSTANCEID, INSTANCEID),
+                      (domainA[0], domainA[1]), (domainA[1], domainA[0])]
+        boxes.set_state(attr_pairs)
+        boxes.emit_list()
+        self.assertEqual(widget.attr_pairs, attr_pairs)
+
+        self.send_signal(widget.Inputs.data, None)
+        self.assertEqual(widget.attr_pairs, [(INDEX, INDEX)])
+
+        self.send_signal(widget.Inputs.data, self.dataA)
+        self.assertEqual(widget.attr_pairs, attr_pairs)
+
+        self.send_signal(widget.Inputs.extra_data, self.dataB)
+        attr_pairs2 = [(domainA[0], domainB[0]), (domainA[1], domainB[1])]
+        boxes.set_state(attr_pairs2)
+        boxes.emit_list()
+        self.assertEqual(widget.attr_pairs, attr_pairs2)
+
+        self.send_signal(widget.Inputs.extra_data, self.dataA)
+        self.assertEqual(widget.attr_pairs, attr_pairs)
+
     def test_migrate_settings(self):
         attr1, attr2, attr3, attr4, attr5 = [object() for _ in range(5)]
         orig_settings = dict(