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

Cidr4 merge algorithm #5

Merged
PavelPatsey merged 91 commits from CIDR4_merge_algorithm into main 2025-01-27 22:05:39 +03:00
Conversation 4 Commits 91 Files Changed 17
+4 -4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eccc03f48d - Show all commits
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]:
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