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
+20 -22
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a4991518ba - Show all commits
vpn_manager/cidr4_merge/cidr4_merger.py
+3 -5
View File
@@ -37,7 +37,8 @@ def ensure_no_neighbors(nodes: list[Node]):
raise Cidr4MergerError(f"There are neighbors! {neighbors=}") raise Cidr4MergerError(f"There are neighbors! {neighbors=}")
def find_parent(a: Node, b: Node) -> Node: def merge_nodes(a: Node, b: Node) -> tuple[Node, int]:
def find_parent(a: Node, b: Node) -> Node:
ia, la = a ia, la = a
ib, lb = b ib, lb = b
min_l = min(la, lb) min_l = min(la, lb)
@@ -47,8 +48,7 @@ def find_parent(a: Node, b: Node) -> Node:
mask = (mask << 1) & ((1 << 32) - 1) mask = (mask << 1) & ((1 << 32) - 1)
return ia & mask, min_l return ia & mask, min_l
def calc_dip(la: int, lb: int, lp: int) -> int:
def calc_dip(la: int, lb: int, lp: int) -> int:
def dip(l1, lp): def dip(l1, lp):
m = lp + 1 m = lp + 1
res = 1 << (l1 - m) res = 1 << (l1 - m)
@@ -58,8 +58,6 @@ 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_nodes(a: Node, b: Node) -> tuple[Node, int]:
p = find_parent(a, b) p = find_parent(a, b)
dip = calc_dip(a[1], b[1], p[1]) dip = calc_dip(a[1], b[1], p[1])
return p, dip return p, dip