a1383be585a1798a3333139c4c1be149d3c5a454,padatious/util.py,,resolve_conflicts,#,128

Before Change

    new_in, new_out = [], []
    for i, inp in enumerate(inputs):
        found_duplicate = False
        for j in range(i + 1, len(inputs)):
            if inp == inputs[j]:
                found_duplicate = True
                if outputs[i] > outputs[j]:
                    outputs[j] = outputs[i]

After Change

            data[tup] = [out]

    inputs, outputs = [], []
    for inp, outs in data.items():
        inputs.append(list(inp))
        outputs.append(np.maximum.reduce(outs))
    return inputs, outputs

Instances