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 af91a066a1 - Show all commits
cidr4_merger.py
+4 -4
View File
6
 @@ -14,9 +14,9 @@ def get_data(input_file):
def cidr4_to_node(cidr4: str) -> Node: def cidr4_to_node(cidr4: str) -> Node:
ip_str, mask_len = cidr4.strip().split("/") ip_address, mask_len = cidr4.strip().split("/")
mask_len = int(mask_len) mask_len = int(mask_len)
a, b, c, d = list(map(int, ip_str.split("."))) a, b, c, d = list(map(int, ip_address.split(".")))
ip = a * 256**3 + b * 256**2 + c * 256**1 + d * 256**0 ip = a * 256**3 + b * 256**2 + c * 256**1 + d * 256**0
added_ips_number = 0 added_ips_number = 0
parent_ip = get_parent_ip(ip, mask_len) parent_ip = get_parent_ip(ip, mask_len)
@@ -109,8 +109,8 @@ def merge_nodes(nodes: list[Node], required_len: int) -> list[Node]:
def make_cidr4(ip, mask_len) -> str: def make_cidr4(ip, mask_len) -> str:
lst = [str(ip >> (i << 3) & 0xFF) for i in reversed(range(4))] lst = [str(ip >> (i << 3) & 0xFF) for i in reversed(range(4))]
ip_str = ".".join(lst) ip_address = ".".join(lst)
return f"{ip_str}/{mask_len}" return f"{ip_address}/{mask_len}"
def answer(nodes: list[Node], required_len: int) -> tuple[list[str], int]: def answer(nodes: list[Node], required_len: int) -> tuple[list[str], int]: