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 fee38af690 - Show all commits
vpn_manager/cidr4_merge/cidr4_merger.py
+4 -4
View File
@@ -31,10 +31,10 @@ def calc_dip(la: int, lb: int, lp: int) -> int:
return dip(la, lp) + dip(lb, lp) return dip(la, lp) + dip(lb, lp)
def merge_two_nodes(node_a: Node, node_b: Node) -> tuple[Node, int]: def merge_two_nodes(a: Node, b: Node) -> tuple[Node, int]:
parent_node = find_parent(node_a, node_b) p = find_parent(a, b)
dip = calc_dip(node_a[1], node_b[1], parent_node[1]) dip = calc_dip(a[1], b[1], p[1])
return parent_node, dip return p, dip
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]: