5 Commits
Author SHA1 Message Date
hasslesstech 84a6ff03c2 lab3-rc1 2026-10-27 20:01:18 +02:00
hasslesstech 75a8ba37c8 yet another performance improvement 2026-10-25 21:31:06 +02:00
hasslesstech 3077e14c07 yet another performance improvement 2026-10-25 21:05:38 +02:00
hasslesstech 8af4bb0b99 update for lab2 2026-10-25 19:57:20 +02:00
hasslesstech 538e7b7784 clean up after lab1 2026-10-24 20:31:25 +03:00
+184 -136
View File
@@ -2,89 +2,167 @@ import matplotlib.pyplot as plt
import networkx as nx import networkx as nx
import pandas as pd import pandas as pd
write_files = False
n = 0
nn_total_levels = 0 nn_total_levels = 0
def nn(cluster_no, node_name): def y(i):
if not nn_total_levels: # backwards compatibility
return str(cluster_no) + '-' + node_name if i.__class__ == str:
return str(cluster_no % nn_total_levels) + '-' + node_name i = int(i.split('-')[0])
def lvl(node_name): return i % round(nn_total_levels ** 0.5)
return int(node_name.split('-')[0])
def x(i):
# backwards compatibility
if i.__class__ == str:
i = int(i.split('-')[0])
return i // round(nn_total_levels ** 0.5)
def xy(i):
return x(i), y(i)
def i(x, y):
return x * round(nn_total_levels ** 0.5) + y
def nn(*args):
if len(args) == 2:
# legacy_mode
cluster_no = args[0]
node_name = args[1]
if not nn_total_levels:
return str(cluster_no) + '-' + node_name
return str(cluster_no % nn_total_levels) + '-' + node_name
else:
# modern mode
x = args[0]
y = args[1]
l = args[2]
return str(i(x, y)) + '-' + l
def join_nodes(g, a, b, target_degree = 6): def join_nodes(g, a, b, target_degree = 6):
if not (g.degree[a] == target_degree or g.degree[b] == target_degree): if a == b:
return
if not (g.degree[a] >= target_degree or g.degree[b] >= target_degree):
g.add_edge(a, b) g.add_edge(a, b)
if g.degree[a] > target_degree or g.degree[b] > target_degree:
g.remove_edge(a, b)
def start_file(p): def start_file(p):
if not write_files:
return
index = ['i', 'N', 'E', 'S', 'D', 'D_avg', 'T', 'C'] index = ['i', 'N', 'E', 'S', 'D', 'D_avg', 'T', 'C']
open(p, 'w').write(','.join(index) + '\n') open(p, 'w').write(','.join(index) + '\n')
def write_file(p, data): def write_file(p, data):
if not write_files:
return
index = ['i', 'N', 'E', 'S', 'D', 'D_avg', 'T', 'C'] index = ['i', 'N', 'E', 'S', 'D', 'D_avg', 'T', 'C']
open(p, 'a').write(','.join([str(data[i]) for i in index]) + '\n') open(p, 'a').write(','.join([str(data[i]) for i in index]) + '\n')
def build_cluster(n): def build_cluster(n):
g = nx.Graph() g = nx.Graph()
nodes = ['ls', 'lu', 'ld', 'm', 'rd', 'ru', 'rs'] nodes = ['ll', 'lu', 'lr', 'ld', 'rl', 'ru', 'rr', 'rd']
edges = [('ls', 'lu'), ('ls', 'ld'), ('ld', 'lu'), edges = [('ll', 'lu'), ('lu', 'lr'), ('lr', 'ld'), ('ld', 'll'),
('rs', 'ru'), ('rs', 'rd'), ('rd', 'ru'), ('rl', 'ru'), ('ru', 'rr'), ('rr', 'rd'), ('rd', 'rl'),
('lu', 'm'), ('ld', 'm'), ('lu', 'ru'), ('ld', 'rd'), ('ll', 'lr'), ('rl', 'rr')]
('ru', 'm'), ('rd', 'm')]
g.add_nodes_from([nn(n, x) for x in nodes]) g.add_nodes_from([nn(n, x) for x in nodes])
g.add_edges_from([tuple(nn(n, y) for y in x) for x in edges]) g.add_edges_from([tuple(nn(n, y) for y in x) for x in edges])
return g return g
def build_network(n): def total_clusters(s):
throw_dist = 4 return 2 ** s - 1
def build_network(l_n):
class P():
def __init__(self, x, y):
self.x = x
self.y = y
g = build_cluster(0) g = build_cluster(0)
global nn_total_levels global n, nn_total_levels
nn_total_levels = n n = l_n
nn_total_levels = l_n ** 2
for i in range(1, n): for j in range(1, nn_total_levels):
c = build_cluster(i) c = build_cluster(j)
g = nx.union(g, c) g = nx.union(g, c)
for i in range(n): for x in range(n):
if n >= 2: for y in range(n):
if i % 2: # regular grid
join_nodes(g, nn(i, 'lu'), nn(i-1, 'lu'), 4) if x < n - 1:
join_nodes(g, nn(i, 'rd'), nn(i-1, 'rd'), 4) join_nodes(g, nn(x, y, 'lr'), nn(x + 1, y, 'rl'))
else: join_nodes(g, nn(x, y, 'rr'), nn(x + 1, y, 'll'))
join_nodes(g, nn(i, 'ld'), nn(i-1, 'ld'), 4)
join_nodes(g, nn(i, 'ru'), nn(i-1, 'ru'), 4)
g.add_edge(nn(i, 'ls'), nn(i-1, 'rs')) if y < n - 1:
g.add_edge(nn(i, 'rs'), nn(i-1, 'ls')) join_nodes(g, nn(x, y, 'lu'), nn(x, y + 1, 'rd'))
join_nodes(g, nn(x, y, 'ru'), nn(x, y + 1, 'ld'))
if n > 1 * throw_dist: # corner cross
g.add_edge(nn(i, 'rs'), nn(i-(1*throw_dist), 'ls')) join_nodes(g, nn(0, 0, 'lu'), nn(n // 2, n // 2, 'lu'))
g.add_edge(nn(i, 'ls'), nn(i-(1*throw_dist), 'rs')) join_nodes(g, nn(n // 2, n // 2, 'ld'), nn(n - 1, n - 1, 'ld'))
if n > 2 * throw_dist: join_nodes(g, nn(n - 1, 0, 'ru'), nn(n // 2, n // 2, 'ru'))
a = nn(i, 'lu') join_nodes(g, nn(n // 2, n // 2, 'rd'), nn(0, n - 1, 'rd'))
b = nn(i-(2*throw_dist), 'lu')
join_nodes(g, a, b) # grid fill
if n > 3 * throw_dist: i = 0
a = nn(i, 'ld') while True:
b = nn(i-(3*throw_dist), 'ld') start = P(n // 2 ** (1 + i) - 1 + n % 2, 0)
join_nodes(g, a, b) step = n // 2 ** (1 + i) - 1 + n % 2
if n > 4 * throw_dist:
a = nn(i, 'ru') if step == 0:
b = nn(i-(4*throw_dist), 'ru') #print(f'Breaking at {i}')
join_nodes(g, a, b) break
if n > 5 * throw_dist:
a = nn(i, 'rd') while True:
b = nn(i-(5*throw_dist), 'rd') #for _ in range(2*i+1):
join_nodes(g, a, b) y = start.y
if n > 7 * throw_dist: while y + step < n:
a = nn(i, 'm') #print('---', i, start.x, y, step, y + step, n)
b = nn(i-(7*throw_dist), 'm') if step == 0:
join_nodes(g, a, b) exit(1)
join_nodes(g, nn(start.x, y, 'll'), nn(start.x - step, y + step, 'll'))
join_nodes(g, nn(start.x, y, 'rr'), nn(start.x + step, y + step, 'rr'))
y += step * 2
join_nodes(g, nn(start.x, y, 'lr'), nn(start.x - step, y - step, 'lr'))
join_nodes(g, nn(start.x, y, 'rl'), nn(start.x + step, y - step, 'rl'))
start.x += step * 2
if start.x + step >= n:
break
i += 1
#visualize(g)
# inline skips
for x in range(n):
for y in range(n):
join_nodes(g, nn(x, y, 'ld'), nn((x + n//2) % n, y, 'ld'))
join_nodes(g, nn(x, y, 'rd'), nn((x + n//3) % n, y, 'rd'))
join_nodes(g, nn(x, y, 'lu'), nn(x, (y + n//5) % n, 'lu'))
join_nodes(g, nn(x, y, 'ru'), nn(x, (y + n//6) % n, 'ru'))
join_nodes(g, nn(x, y, 'll'), nn((x + round(n//3)) % n, (y + round(n//3)) % n, 'll'))
join_nodes(g, nn(x, y, 'rr'), nn((x + round(n//2)) % n, (y + round(n//2)) % n, 'rr'))
join_nodes(g, nn(x, y, 'lr'), nn((x + round(n//3)) % n, (y - round(n//3)) % n, 'lr'))
join_nodes(g, nn(x, y, 'rl'), nn((x + round(n//2)) % n, (y - round(n//2)) % n, 'rl'))
return g return g
@@ -108,104 +186,87 @@ def analyze(G: nx.Graph) -> dict:
'C': C, 'C': C,
} }
def visualize(g): def visualize(g):
def draw_edges_between(a, b, lvl_min = 0, lvl_max = False, color = 'black', width = 1.0, debug = False, direct = False): def draw_edges_between(a, b, x_min = 0, x_max = False, y_min = 0, y_max = False, color = 'black', width = 1.0, debug = False, direct = False, fmode = True, fmask = [1, 1, 1, 1], fsplit = False):
edgelist = [e for e in g.edges() if all([True if (a in i) or (b in i) else False for i in e])] edgelist = [e for e in g.edges() if all([True if (a in i) or (b in i) else False for i in e])]
edgelist_filtered = []
if debug: for i in edgelist:
print(edgelist) pa, pb = i
if lvl_max.__class__ == bool: constraints = [True] * 4
if debug:
print("Running 1 branch")
edgelist = [(pa, pb) for pa, pb in edgelist if not (abs(lvl(pa) - lvl(pb)) < lvl_min or nn_total_levels - abs(lvl(pa) - lvl(pb)) < lvl_min)] if (x_max.__class__ != bool) and (abs(x(pa) - x(pb)) > x_max):
''' constraints[1] = False
for p in edgelist:
if abs(lvl(pa) - lvl(pb)) < lvl_min:
edgelist.remove((pa, pb))
'''
else:
if debug:
print(f"Running 2 branch on {edgelist}")
edgelist = [(pa, pb) for pa, pb in edgelist if not ((abs(lvl(pa) - lvl(pb)) < lvl_min or nn_total_levels - abs(lvl(pa) - lvl(pb)) < lvl_min) or (abs(lvl(pa) - lvl(pb)) > lvl_max and nn_total_levels - abs(lvl(pa) - lvl(pb)) > lvl_max))] if (y_max.__class__ != bool) and (abs(y(pa) - y(pb)) > y_max):
''' constraints[3] = False
for pa, pb in edgelist:
if debug:
print(f"Processing ({pa}, {pb})")
if abs(lvl(pa) - lvl(pb)) < lvl_min or abs(lvl(pa) - lvl(pb)) > lvl_max: if abs(x(pa) - x(pb)) < x_min:
edgelist.remove((pa, pb)) constraints[0] = False
if debug:
print(f'Discarding {pa} <-> {pb} (lvl(pa) == {lvl(pa)}, lvl(pb) == {lvl(pb)})')
elif debug:
print(f'Leaving {pa} <-> {pb} (lvl(pa) == {lvl(pa)}, lvl(pb) == {lvl(pb)})')
for pa, pb in edgelist: if abs(y(pa) - y(pb)) < y_min:
if debug: constraints[2] = False
print(f"Processing ({pa}, {pb})")
if abs(lvl(pa) - lvl(pb)) < lvl_min or abs(lvl(pa) - lvl(pb)) > lvl_max: #filt = [v for k, v in enumerate(constraints) if fmask[k]]
edgelist.remove((pa, pb)) if fsplit:
if debug: if any([all(constraints[:2]), all(constraints[2:])]):
print(f'Discarding {pa} <-> {pb} (lvl(pa) == {lvl(pa)}, lvl(pb) == {lvl(pb)})') edgelist_filtered.append(i)
elif debug: else:
print(f'Leaving {pa} <-> {pb} (lvl(pa) == {lvl(pa)}, lvl(pb) == {lvl(pb)})') if all(constraints):
''' edgelist_filtered.append(i)
if debug: #if fmode:
print(edgelist) # if all(filt):
# edgelist_filtered.append(i)
#else:
# if any(filt):
# edgelist_filtered.append(i)
if direct: if direct:
nx.draw_networkx_edges(g, exp_pos, edgelist = edgelist, width = width, edge_color = color) nx.draw_networkx_edges(g, exp_pos, edgelist = edgelist_filtered, width = width, edge_color = color)
else: else:
nx.draw_networkx_edges(g, exp_pos, edgelist = edgelist, connectionstyle='arc3,rad=0.2', arrows=True, width = width, edge_color = color) nx.draw_networkx_edges(g, exp_pos, edgelist = edgelist_filtered, connectionstyle='arc3,rad=0.2', arrows=True, width = width, edge_color = color)
pos = { pos = {
'ls': (-2, 0), 'll': (-3, 0),
'lu': (-1, 1), 'lu': (-2, 1),
'ld': (-1, -1), 'lr': (-1, 0),
'm' : (0, 0), 'ld': (-2, -1),
'ru': (1, 1), 'rl': (1, 0),
'rd': (1, -1), 'ru': (2, 1),
'rs': (2, 0) 'rr': (3, 0),
'rd': (2, -1)
} }
exp_pos = {} exp_pos = {}
for i in range(nn_total_levels): for i in range(nn_total_levels):
for j, v in pos.items(): for j, v in pos.items():
exp_pos[nn(i, j)] = (v[0], v[1] * 0.65 + 3 * i) from math import log
bx, by = xy(i)
exp_pos[nn(i, j)] = (v[0] + bx * 8, v[1] + by * 3)
nx.draw_networkx_nodes(g, exp_pos, node_size = 600) nx.draw_networkx_nodes(g, exp_pos, node_size = 100)
nx.draw_networkx_labels(g, exp_pos, font_size = 8) nx.draw_networkx_labels(g, exp_pos, font_size = 3)
#nx.draw_networkx_edges(g, exp_pos, edgelist = [e for e in g.edges() if all([True if ('ls' in i) or ('rs' in i) else False for i in e])], connectionstyle='arc3,rad=0.2', arrows=True)
# cluster # cluster
draw_edges_between('', '', lvl_max = 0, color = '#888888', width = 0.5, direct = True) draw_edges_between('', '', x_max = 0, y_max = 0, color = '#888888', width = 0.5, direct = True)
# S => 4 # regular grid
draw_edges_between('ls', 'rs', lvl_max = 1, color = '#33AAAA', width = 2) draw_edges_between('', '', x_min = 1, x_max = 1, y_min = 1, y_max = 1, color = '#FF0000', width = 2.0, fsplit = True)
draw_edges_between('lu', 'lu', lvl_max = 1, color = '#AAAA33', width = 1) # anything (debug)
draw_edges_between('ru', 'ru', lvl_max = 1, color = '#AAAA33', width = 1) draw_edges_between('', '', x_min = 1, y_min = 1, color = '#00FF00', width = 2.0, direct = True)
draw_edges_between('ld', 'ld', lvl_max = 1, color = '#AAAA33', width = 1)
draw_edges_between('rd', 'rd', lvl_max = 1, color = '#AAAA33', width = 1)
# S => 6
draw_edges_between('lu', 'lu', lvl_min = 2, color = '#FF0000', width = 1.5)
draw_edges_between('ld', 'ld', lvl_min = 2, color = '#FFFF00', width = 1.5)
draw_edges_between('ru', 'ru', lvl_min = 2, color = '#00FF00', width = 1.5)
draw_edges_between('rd', 'rd', lvl_min = 2, color = '#00FFFF', width = 1.5)
draw_edges_between('ls', 'ls', lvl_min = 2, color = '#0000FF', width = 1.5)
draw_edges_between('rs', 'rs', lvl_min = 2, color = '#FF00FF', width = 1.5)
draw_edges_between('m' , 'm' , lvl_min = 2, color = '#000000', width = 1.5)
plt.show() plt.show()
def main(): def main():
global write_files
write_files = False
i = 0 i = 0
start_file('data.csv') start_file('data.csv')
@@ -218,25 +279,12 @@ def main():
r = analyze(g) r = analyze(g)
r.update({"i": i}) r.update({"i": i})
'''
if d.__class__ == None.__class__:
d = pd.DataFrame(r, index = ['i', 'N', 'E', 'S', 'D', 'D_avg', 'T', 'C'])
else:
d.add(r)
'''
print(r) print(r)
write_file('data.csv', r) write_file('data.csv', r)
if g.number_of_nodes() > 1000: if g.number_of_nodes() > 2000:
break break
#print(r)
#nx.draw(g, with_labels = True)
#plt.show()
#d.to_csv('data.csv')
def test(): def test():
g = build_network(15) g = build_network(15)
print(analyze(g)) print(analyze(g))
@@ -251,9 +299,9 @@ def test2():
print(set([v for i, v in g.degree()])) print(set([v for i, v in g.degree()]))
def test3(): def test3():
g = build_network(3) g = build_network(9)
#print(g.adj['0-ls'])
visualize(g) visualize(g)
if __name__=="__main__": if __name__=="__main__":
test3() #test3()
main()