fedor/wcm
1
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

add cosmetic changes (more comfortable work with arguments)

Browse Source
This commit is contained in:
Pavel Patsey
2025-01-25 10:15:42 +03:00
parent 735a3c0216
commit eccc03f48d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vpn_manager/cidr4_merge/cidr4_merger.py
+4 -4
View File
@@ -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]: def merge_nodes(nodes: list[Node], required_len: int) -> tuple[list[Node], int]:
sum_dip = 0 sum_dip = 0
while len(nodes) > required_len: 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:])): for i, (a, b) in enumerate(zip(nodes, nodes[1:])):
parent_node, dip = merge_two_nodes(a, b) parent_node, dip = merge_two_nodes(a, b)
if dip < min_tuple[1][1]: if dip < min_tuple[2]:
min_tuple = i, (parent_node, dip) min_tuple = i, parent_node, dip
idx, (parent_node, dip) = min_tuple idx, parent_node, dip = min_tuple
nodes = nodes[:idx] + [parent_node] + nodes[idx + 2 :] nodes = nodes[:idx] + [parent_node] + nodes[idx + 2 :]
sum_dip += dip sum_dip += dip