From eccc03f48da8802d240e45e24a43ec4281e79abf Mon Sep 17 00:00:00 2001 From: Pavel Patsey Date: Sat, 25 Jan 2025 10:15:42 +0300 Subject: [PATCH] add cosmetic changes (more comfortable work with arguments) --- vpn_manager/cidr4_merge/cidr4_merger.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vpn_manager/cidr4_merge/cidr4_merger.py b/vpn_manager/cidr4_merge/cidr4_merger.py index 2a5ede9..6b3a5e0 100644 --- a/vpn_manager/cidr4_merge/cidr4_merger.py +++ b/vpn_manager/cidr4_merge/cidr4_merger.py @@ -46,12 +46,12 @@ def merge_two_nodes(node_a: Node, node_b: Node) -> tuple[Node, int]: def merge_nodes(nodes: list[Node], required_len: int) -> tuple[list[Node], int]: sum_dip = 0 while len(nodes) > required_len: - min_tuple = None, (None, float("inf")) + min_tuple = None, None, float("inf") for i, (a, b) in enumerate(zip(nodes, nodes[1:])): parent_node, dip = merge_two_nodes(a, b) - if dip < min_tuple[1][1]: - min_tuple = i, (parent_node, dip) - idx, (parent_node, dip) = min_tuple + if dip < min_tuple[2]: + min_tuple = i, parent_node, dip + idx, parent_node, dip = min_tuple nodes = nodes[:idx] + [parent_node] + nodes[idx + 2 :] sum_dip += dip