scottk/oopt-gnpy
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/oopt-gnpy.git synced 2025-10-31 18:18:00 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

plot: Show something useful for missing city names

Browse Source 
This makes it possible to render at least something on tiny topologies
now that YANG doesn't support city labels.

Change-Id: I1431b557b2eecd34bf24557fdee0da0f2c2c0487
This commit is contained in:
Jan Kundrát
2020-08-01 22:55:01 +02:00
parent 643680ec47
commit 15df99510f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gnpy/tools/plots.py
View File

@@ -13,10 +13,14 @@ from networkx import draw_networkx_nodes, draw_networkx_edges, draw_networkx_lab
from gnpy.core.elements import Transceiver from gnpy.core.elements import Transceiver
def _try_city(node):
return node.location.city if node.location.city else node.uid
def plot_baseline(network): def plot_baseline(network):
edges = set(network.edges()) edges = set(network.edges())
pos = {n: (n.lng, n.lat) for n in network.nodes()} pos = {n: (n.lng, n.lat) for n in network.nodes()}
labels = {n: n.location.city for n in network.nodes() if isinstance(n, Transceiver)} labels = {n: _try_city(n) for n in network.nodes() if isinstance(n, Transceiver)}
city_labels = set(labels.values()) city_labels = set(labels.values())
for n in network.nodes(): for n in network.nodes():
if n.location.city and n.location.city not in city_labels: if n.location.city and n.location.city not in city_labels:
@@ -40,7 +44,8 @@ def plot_results(network, path, source, destination):
nodes = {} nodes = {}
for k, (x, y) in pos.items(): for k, (x, y) in pos.items():
nodes.setdefault((round(x, 1), round(y, 1)), []).append(k) nodes.setdefault((round(x, 1), round(y, 1)), []).append(k)
labels = {n: n.location.city for n in network.nodes() if isinstance(n, Transceiver)}
labels = {n: _try_city(n) for n in network.nodes() if isinstance(n, Transceiver)}
city_labels = set(labels.values()) city_labels = set(labels.values())
for n in network.nodes(): for n in network.nodes():
if n.location.city and n.location.city not in city_labels: if n.location.city and n.location.city not in city_labels:
@@ -56,7 +61,7 @@ def plot_results(network, path, source, destination):
draw_networkx_edges(network, edgelist=edges, edge_color='#ababab', **kwargs) draw_networkx_edges(network, edgelist=edges, edge_color='#ababab', **kwargs)
draw_networkx_edges(network, edgelist=path_edges, edge_color='#ff0000', **kwargs) draw_networkx_edges(network, edgelist=path_edges, edge_color='#ff0000', **kwargs)
draw_networkx_labels(network, labels=labels, font_size=14, **{**kwargs, 'pos': label_pos}) draw_networkx_labels(network, labels=labels, font_size=14, **{**kwargs, 'pos': label_pos})
title(f'Propagating from {source.loc.city} to {destination.loc.city}') title(f'Propagating from {_try_city(source)} to {_try_city(destination)}')
axis('off') axis('off')
heading = 'Spectral Information\n\n' heading = 'Spectral Information\n\n'