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
+12 -12
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 04b4d14a30 - Show all commits
vpn_manager/cidr4_merge/cidr4_merger.py
+12 -12
View File
@@ -37,22 +37,22 @@ def merge_two_nodes(a: Node, b: Node) -> tuple[Node, int]:
return p, dip return p, dip
def merge_nodes(nodes: list[Node], required_len: int) -> tuple[list[Node], int]: def merge_nodes(nodes: list[Node], req_len: int) -> tuple[list[Node], int]:
sum_dip = 0 sum_dip = 0
while len(nodes) > required_len: while len(nodes) > req_len:
min_tuple = None, None, float("inf") min_t = 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) p, dip = merge_two_nodes(a, b)
if dip < min_tuple[2]: if dip < min_t[2]:
min_tuple = i, parent_node, dip min_t = i, p, dip
idx, parent_node, dip = min_tuple i, p, dip = min_t
nodes = nodes[:idx] + [parent_node] + nodes[idx + 2 :] nodes = nodes[:i] + [p] + nodes[i + 2 :]
sum_dip += dip sum_dip += dip
while neighbors := find_neighbors(nodes): while nbs := find_neighbors(nodes):
idx, a, b = neighbors[0] i, a, b = nbs[0]
parent_node, dip = merge_two_nodes(a, b) p, dip = merge_two_nodes(a, b)
nodes = nodes[:idx] + [parent_node] + nodes[idx + 2 :] nodes = nodes[:i] + [p] + nodes[i + 2 :]
sum_dip += dip sum_dip += dip
return nodes, sum_dip return nodes, sum_dip