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
+2 -7
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a160ffd3a2 - Show all commits
vpn_manager/cidr4_merge/cidr4_merger.py
+2 -7
View File
@@ -69,15 +69,10 @@ def merge_nodes(nodes: list[Node], required_len: int) -> tuple[list[Node], int]:
def main(): def main():
file = "cidr4.txt"
required_len = 20 required_len = 20
data = get_data()
data = get_data(file) nodes = sorted(map(cidr4_to_node, data))
nodes = list(map(cidr4_to_node, data))
nodes = sorted(nodes)
merged_nodes, sum_dip = merge_nodes(nodes, required_len) merged_nodes, sum_dip = merge_nodes(nodes, required_len)
cidr4s = [make_cidr4(ip, mask_len) for ip, mask_len in merged_nodes] cidr4s = [make_cidr4(ip, mask_len) for ip, mask_len in merged_nodes]
print(sorted(cidr4s), sum_dip, sep="\n") print(sorted(cidr4s), sum_dip, sep="\n")