init new algorithm
This commit is contained in:
Павел
+2
-155
@@ -11,166 +11,13 @@ def get_data(input_file):
|
||||
return data
|
||||
|
||||
|
||||
def cidr4_to_binary(cidr4: str) -> str:
|
||||
ip_str, vlsm = cidr4.strip().split("/")
|
||||
vlsm = int(vlsm)
|
||||
ipv4 = IPv4Address(ip_str)
|
||||
binary_ip = bin(int(ipv4))[2:]
|
||||
binary_ip = binary_ip.zfill(32)
|
||||
return binary_ip[:vlsm] + "0" * (32 - vlsm)
|
||||
|
||||
|
||||
def binary_to_cidr4(binary: str) -> str:
|
||||
vlsm = binary.rfind("1") + 1 if "1" in binary else 0
|
||||
int_ip = int(binary, 2)
|
||||
ip = IPv4Address(int_ip)
|
||||
return f"{ip}/{vlsm}"
|
||||
|
||||
|
||||
def reduce_binary(binary: str) -> str:
|
||||
vlsm = binary.rfind("1")
|
||||
if vlsm == -1:
|
||||
return binary
|
||||
return binary[:vlsm] + "0" + binary[vlsm + 1 :]
|
||||
|
||||
|
||||
def get_mask(binary: str) -> str:
|
||||
i = binary.rfind("1")
|
||||
return binary[: i + 1]
|
||||
|
||||
|
||||
def remove_ips_with_subnets(binaries: Set[str]) -> Set[str]:
|
||||
sorted_binaries = sorted(binaries)
|
||||
result = set()
|
||||
for x, y in zip(sorted_binaries, sorted_binaries[1:]):
|
||||
mask = get_mask(x)
|
||||
if not y.startswith(mask):
|
||||
result.add(x)
|
||||
result.add(sorted_binaries[-1])
|
||||
return result
|
||||
|
||||
|
||||
def rough_merge_binaries(binaries: List[str], req_len: int) -> List[str]:
|
||||
ips = set(deepcopy(binaries))
|
||||
reduction_limit_reached = False
|
||||
max_vlsm = None
|
||||
while len(ips) > req_len and not reduction_limit_reached and max_vlsm != -1:
|
||||
ip_with_max_vlsm = max(ips, key=lambda x: x.rfind("1"))
|
||||
max_vlsm = ip_with_max_vlsm.rfind("1")
|
||||
reduced_ips = set()
|
||||
other_ips = set()
|
||||
for ip in ips:
|
||||
if ip.rfind("1") == max_vlsm:
|
||||
reduced_ips.add(reduce_binary(ip))
|
||||
else:
|
||||
other_ips.add(ip)
|
||||
|
||||
merged_ips = remove_ips_with_subnets(reduced_ips | other_ips)
|
||||
if len(merged_ips) > req_len:
|
||||
ips = merged_ips
|
||||
else:
|
||||
reduction_limit_reached = True
|
||||
|
||||
return sorted(ips)
|
||||
|
||||
|
||||
def smooth_merge_binaries(binaries: List[str], req_len: int) -> List[str]:
|
||||
ips = set(deepcopy(binaries))
|
||||
|
||||
while len(ips) > req_len:
|
||||
group_dict = defaultdict(list)
|
||||
for ip in ips:
|
||||
group_dict[ip.rfind("1")].append(ip)
|
||||
|
||||
max_len = max(group_dict)
|
||||
sorted_group = sorted(group_dict[max_len])
|
||||
for x, y in zip(sorted_group, sorted_group[1:]):
|
||||
mask = get_mask(x)
|
||||
if y.startswith(mask):
|
||||
ips.remove(x)
|
||||
ips.remove(y)
|
||||
ips.add(reduce_binary(x))
|
||||
break
|
||||
else:
|
||||
x = sorted_group[0]
|
||||
ips.remove(x)
|
||||
ips.add(reduce_binary(x))
|
||||
|
||||
ips = remove_ips_with_subnets(ips)
|
||||
|
||||
return sorted(ips)
|
||||
|
||||
|
||||
def main():
|
||||
file = "cidr4.txt"
|
||||
required_len = 15
|
||||
|
||||
data = get_data(file)
|
||||
bin_ips = list(map(cidr4_to_binary, data))
|
||||
# for ip in bin_ips:
|
||||
# print(ip)
|
||||
# print("#" * 128)
|
||||
|
||||
rough_merged_bin_ips = rough_merge_binaries(bin_ips, required_len)
|
||||
print(f"{len(rough_merged_bin_ips)=}")
|
||||
for ip in rough_merged_bin_ips:
|
||||
print(ip)
|
||||
|
||||
print("\n" + "#" * 128 + "\n")
|
||||
|
||||
smooth_merged_bin_ips = smooth_merge_binaries(rough_merged_bin_ips, required_len)
|
||||
print(f"{len(smooth_merged_bin_ips)=}")
|
||||
for ip in smooth_merged_bin_ips:
|
||||
print(ip)
|
||||
|
||||
# smooth_merged_bin_ips = smooth_merge_binaries(bin_ips, required_len)
|
||||
# print(f"{len(smooth_merged_bin_ips)=}")
|
||||
# for ip in smooth_merged_bin_ips:
|
||||
# print(ip)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
assert cidr4_to_binary("4.78.139.0/24") == "00000100010011101000101100000000"
|
||||
assert cidr4_to_binary("128.0.0.0/1") == "10000000000000000000000000000000"
|
||||
assert cidr4_to_binary("0.0.0.0/0") == "0" * 32
|
||||
assert cidr4_to_binary("0.8.0.0/13") == "00000000000010000000000000000000"
|
||||
|
||||
assert binary_to_cidr4("00000100010011101000101100000000") == "4.78.139.0/24"
|
||||
assert binary_to_cidr4("10000000000000000000000000000000") == "128.0.0.0/1"
|
||||
assert binary_to_cidr4("00000000000000000000000000000000") == "0.0.0.0/0"
|
||||
assert binary_to_cidr4("00000000000010000000000000000000") == "0.8.0.0/13"
|
||||
|
||||
assert (
|
||||
reduce_binary("00000100010011101000101100000000")
|
||||
== "00000100010011101000101000000000"
|
||||
)
|
||||
assert reduce_binary("10000000000000000000000000000000") == "0" * 32
|
||||
assert reduce_binary("0" * 32) == "0" * 32
|
||||
assert reduce_binary("00000000000010000000000000000000") == "0" * 32
|
||||
|
||||
assert get_mask("00000100010011101000101100000000") == "000001000100111010001011"
|
||||
assert get_mask("10000000000000000000000000000000") == "1"
|
||||
assert get_mask("00000000000000000000000000000000") == ""
|
||||
assert get_mask("00000000000010000000000000000000") == "0000000000001"
|
||||
|
||||
assert remove_ips_with_subnets(
|
||||
{
|
||||
"0001000",
|
||||
"0001100",
|
||||
"0001110",
|
||||
"0001111",
|
||||
"0101000",
|
||||
}
|
||||
) == {
|
||||
"0001111",
|
||||
"0101000",
|
||||
}
|
||||
|
||||
assert remove_ips_with_subnets({"0001000"}) == {"0001000"}
|
||||
assert remove_ips_with_subnets({"1111000", "0101000"}) == {
|
||||
"1111000",
|
||||
"0101000",
|
||||
}
|
||||
|
||||
# main()
|
||||
cProfile.run("main()")
|
||||
main()
|
||||
# cProfile.run("main()")
|
||||
|
||||
Reference in New Issue
Block a user