init new algorithm
This commit is contained in:
Pavel Patsey
+13
-149
@@ -1,10 +1,6 @@
|
||||
import cProfile
|
||||
import sys
|
||||
from collections import defaultdict
|
||||
|
||||
sys.setrecursionlimit(10_000)
|
||||
|
||||
Node = tuple[int, int, int, int]
|
||||
Node = tuple[int, int, int]
|
||||
|
||||
|
||||
class Cidr4MergerError(Exception):
|
||||
@@ -23,12 +19,11 @@ def cidr4_to_node(cidr4: str) -> Node:
|
||||
a, b, c, d = list(map(int, ip_address.split(".")))
|
||||
ip = a * 256**3 + b * 256**2 + c * 256**1 + d * 256**0
|
||||
added_ips_number = 0
|
||||
parent_ip = get_parent_ip(ip, mask_len)
|
||||
return ip, mask_len, added_ips_number, parent_ip
|
||||
return ip, mask_len, added_ips_number
|
||||
|
||||
|
||||
def sort_nodes(nodes: list[Node]) -> list[Node]:
|
||||
return sorted(nodes, key=lambda x: (x[1], x[0]))
|
||||
return sorted(nodes)
|
||||
|
||||
|
||||
def get_net_addr(ip: int, mask_len: int) -> int:
|
||||
@@ -43,72 +38,9 @@ def get_parent_ip(ip: int, mask_len: int) -> int:
|
||||
return get_net_addr(ip, mask_len - 1)
|
||||
|
||||
|
||||
def have_same_parent(mask_len_a, parent_ip_a, mask_len_b, parent_ip_b) -> bool:
|
||||
return mask_len_a == mask_len_b and parent_ip_a == parent_ip_b
|
||||
|
||||
|
||||
def get_group_with_max_mask_len(nodes: list[Node]) -> list[Node]:
|
||||
max_mask_len = max(nodes, key=lambda x: x[1])[1]
|
||||
return list(filter(lambda x: x[1] == max_mask_len, nodes))
|
||||
|
||||
|
||||
def make_parent(a: Node, b: Node | None = None) -> Node:
|
||||
ip_a, mask_len_a, added_ips_number_a, parent_ip_a = a
|
||||
if b:
|
||||
ip_b, mask_len_b, added_ips_b, parent_ip_b = b
|
||||
if not have_same_parent(mask_len_a, parent_ip_a, mask_len_b, parent_ip_b):
|
||||
raise Cidr4MergerError("Nodes must be neighbors!")
|
||||
added_ips_number = added_ips_number_a + added_ips_b
|
||||
else:
|
||||
added_ips_number = added_ips_number_a + 2 ** (32 - mask_len_a)
|
||||
ip = parent_ip_a
|
||||
mask_len = mask_len_a - 1
|
||||
parent_ip = get_parent_ip(ip, mask_len)
|
||||
return ip, mask_len, added_ips_number, parent_ip
|
||||
|
||||
|
||||
def reduce_nodes(nodes: list[Node]) -> list[Node]:
|
||||
group = get_group_with_max_mask_len(nodes)
|
||||
|
||||
neighbours = []
|
||||
loners = []
|
||||
i = 0
|
||||
while i < len(group) - 1:
|
||||
a, b = group[i], group[i + 1]
|
||||
ip_a, mask_len_a, _, parent_ip_a = a
|
||||
ip_b, mask_len_b, _, parent_ip_b = b
|
||||
if have_same_parent(mask_len_a, parent_ip_a, mask_len_b, parent_ip_b):
|
||||
neighbours.append((a, b))
|
||||
i += 2
|
||||
else:
|
||||
loners.append(a)
|
||||
i += 1
|
||||
if i == len(group) - 1:
|
||||
loners.append(group[i])
|
||||
|
||||
if neighbours:
|
||||
zipped = zip(neighbours, map(lambda x: make_parent(x[0], x[1]), neighbours))
|
||||
min_zipped = min(zipped, key=lambda x: x[1][2])
|
||||
(a, b), parent = min_zipped
|
||||
nodes.remove(a)
|
||||
nodes.remove(b)
|
||||
nodes.append(parent)
|
||||
elif loners:
|
||||
zipped = zip(loners, map(make_parent, loners))
|
||||
min_zipped = min(zipped, key=lambda x: x[1][2])
|
||||
a, parent = min_zipped
|
||||
nodes.remove(a)
|
||||
nodes.append(parent)
|
||||
else:
|
||||
assert False, "Error"
|
||||
|
||||
return sort_nodes(nodes)
|
||||
|
||||
|
||||
def merge_nodes_deprecated(nodes: list[Node], required_len: int) -> list[Node]:
|
||||
while len(nodes) > required_len:
|
||||
nodes = reduce_nodes(nodes)
|
||||
return nodes
|
||||
def make_parent(a: Node, b: Node) -> Node:
|
||||
ip, mask_len, added_ips_number = None
|
||||
return ip, mask_len, added_ips_number
|
||||
|
||||
|
||||
def make_cidr4(ip, mask_len) -> str:
|
||||
@@ -117,81 +49,14 @@ def make_cidr4(ip, mask_len) -> str:
|
||||
return f"{ip_address}/{mask_len}"
|
||||
|
||||
|
||||
def lift_lonely_node(nodes: list[Node], singles: list[Node]) -> list[Node]:
|
||||
# find single whose parent has the least added addresses
|
||||
min_single, min_parent = singles[0], make_parent(singles[0])
|
||||
for node in singles[1:]:
|
||||
parent = make_parent(node)
|
||||
if parent[2] < min_parent[2]:
|
||||
min_single, min_parent = node, parent
|
||||
|
||||
nodes.remove(min_single)
|
||||
nodes.append(min_parent)
|
||||
nodes = sort_nodes(nodes)
|
||||
return nodes
|
||||
|
||||
|
||||
def merge_neighbors(
|
||||
nodes: list[Node], neighbours: list[tuple[Node, Node]]
|
||||
) -> list[Node]:
|
||||
for a, b in neighbours:
|
||||
parent = make_parent(a, b)
|
||||
nodes.remove(a)
|
||||
nodes.remove(b)
|
||||
nodes.append(parent)
|
||||
return sort_nodes(nodes)
|
||||
|
||||
|
||||
def find_neighbours_singles(groups: defaultdict) -> tuple[list, list]:
|
||||
neighbours = []
|
||||
singles = []
|
||||
for group in groups.values():
|
||||
i = 0
|
||||
while i < len(group) - 1:
|
||||
a, b = group[i], group[i + 1]
|
||||
ip_a, mask_len_a, _, parent_ip_a = a
|
||||
ip_b, mask_len_b, _, parent_ip_b = b
|
||||
if have_same_parent(mask_len_a, parent_ip_a, mask_len_b, parent_ip_b):
|
||||
neighbours.append((a, b))
|
||||
i += 2
|
||||
else:
|
||||
singles.append(a)
|
||||
i += 1
|
||||
if i == len(group) - 1:
|
||||
singles.append(group[i])
|
||||
return neighbours, singles
|
||||
|
||||
|
||||
def make_groups(nodes: list[Node]) -> defaultdict:
|
||||
groups = defaultdict(list)
|
||||
for n in nodes:
|
||||
groups[n[1]].append(n)
|
||||
return groups
|
||||
|
||||
|
||||
def merge_nodes_recursion(nodes: list[Node], required_len: int) -> list[Node]:
|
||||
if len(nodes) <= required_len:
|
||||
return nodes
|
||||
groups = make_groups(nodes)
|
||||
neighbours, singles = find_neighbours_singles(groups)
|
||||
if neighbours:
|
||||
new_nodes = merge_neighbors(nodes, neighbours)
|
||||
return merge_nodes_recursion(new_nodes, required_len)
|
||||
new_nodes = lift_lonely_node(nodes, singles)
|
||||
return merge_nodes_recursion(new_nodes, required_len)
|
||||
|
||||
|
||||
def merge_nodes_cycle(nodes_to_merge: list[Node], required_len: int) -> list[Node]:
|
||||
def merge_nodes(nodes_to_merge: list[Node], required_len: int) -> list[Node]:
|
||||
nodes = [x for x in nodes_to_merge]
|
||||
while not len(nodes) <= required_len:
|
||||
groups = make_groups(nodes)
|
||||
neighbours, singles = find_neighbours_singles(groups)
|
||||
if neighbours:
|
||||
nodes = merge_neighbors(nodes, neighbours)
|
||||
elif singles:
|
||||
nodes = lift_lonely_node(nodes, singles)
|
||||
else:
|
||||
raise Cidr4MergerError("Invalid case!")
|
||||
# преобразовать список нод в список туплов: родитель (ip, mask len, added ips), d_ip = кол-во добавляемых адресов
|
||||
# найти подходящего родителя (с минимальным значением d_ip), затем мержить два узла:
|
||||
# 1) если в соседних ветках
|
||||
# 2) если один из узлов находится в подсети у другого
|
||||
# повторить пока не достигнем нужного кол-ва узлов
|
||||
|
||||
return nodes
|
||||
|
||||
|
||||
@@ -203,7 +68,6 @@ def main():
|
||||
nodes = list(map(cidr4_to_node, data))
|
||||
|
||||
nodes = sort_nodes(nodes)
|
||||
# merged_nodes = merge_nodes_deprecated(nodes, required_len)
|
||||
# merged_nodes = merge_nodes_recursion(nodes, required_len)
|
||||
merged_nodes = merge_nodes_cycle(nodes, required_len)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user