d0c97911330dc284c9d734d0588e75a0e6a84711,Orange/widgets/data/owmergedata.py,OWMergeData,send_report,#OWMergeData#,155

Before Change

    def send_report(self):
        attr_a = None
        attr_b = None
        if self.dataA is not None:
            attr_a = self.attr_a
            if attr_a in self.dataA.domain:
                attr_a = self.dataA.domain[attr_a]
        if self.dataB is not None:
            attr_b = self.attr_b
            if attr_b in self.dataB.domain:
                attr_b = self.dataB.domain[attr_b]
        self.report_items((
            ("Attribute A", attr_a),
            ("Attribute B", attr_b),
        ))


def merge(A, varA, B, varB, inner=True):
    join_indices = inner_join_indices(A, B, varA, varB) if inner else \

After Change

        self.commit()

    def send_report(self):
        attr = (self.attr_augment_data, self.attr_merge_data,
                self.attr_combine_data)
        extra_attr = (self.attr_augment_extra, self.attr_merge_extra,
                      self.attr_combine_extra)
        merging_types = ("Append columns from Extra Data", "Find matching rows",
                         "Concatenate tables, merge rows")
        self.report_items((
            ("Merging", merging_types[int(self.merging)]),
            ("Data attribute", attr[int(self.merging)]),
            ("Extra data attribute", extra_attr[int(self.merging)])))


def merge(A, varA, B, varB, merge_type):
    indices = join_indices(A, B, varA, varB, merge_type)

Instances