Commit 63fefdeb authored by Brewer, Wes's avatar Brewer, Wes
Browse files

Clean up: Remove plot_network_graph() and references

parent 32a0b2c9

raps/plotting.py

+0 −37
Original line number Diff line number Diff line
@@ -408,43 +408,6 @@ def plot_nodes_gantt(*, ax=None, jobs): 
    return ax





def plot_network_graph(G, filename, layout='spring'):

    """

    Plot the network graph with edge labels and save it to a file.



    Parameters

    ----------

    G : networkx.Graph

        The graph to plot.

    filename : str

        The path to save the plot.

    layout : str, optional

        The layout to use for the plot. Can be 'spring', 'circular', 'kamada_kawai', 'random', 'shell', 'spectral'.

        Default is 'spring'.

    """

    plt.figure(figsize=(20, 20))

    if layout == 'spring':

        pos = nx.spring_layout(G)

    elif layout == 'circular':

        pos = nx.circular_layout(G)

    elif layout == 'kamada_kawai':

        pos = nx.kamada_kawai_layout(G)

    elif layout == 'random':

        pos = nx.random_layout(G)

    elif layout == 'shell':

        pos = nx.shell_layout(G)

    elif layout == 'spectral':

        pos = nx.spectral_layout(G)

    else:

        raise ValueError(f"Unsupported layout: {layout}")



    nx.draw(G, pos, with_labels=True, node_size=500, node_color="skyblue")

    edge_labels = nx.get_edge_attributes(G, "capacity")

    nx.draw_networkx_edge_labels(G, pos, edge_labels=edge_labels)

    plt.savefig(filename)

    plt.close()





def plot_fattree_hierarchy(G, k=32, save_path='net_fattree.png'):

    """Draw a hierarchical Fat-Tree layout with automatic scaling."""

    pos = {}

raps/run_sim.py

+1 −10
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import pandas as pd 
import sys

import warnings

from raps.ui import LayoutManager

from raps.plotting import Plotter, plot_network_graph

from raps.plotting import Plotter

from raps.engine import Engine

from raps.multi_part_engine import MultiPartEngine

from raps.utils import write_dict_to_file, pydantic_add_args, SubParsers, read_yaml_parsed
@@ -148,15 +148,6 @@ def run_sim(sim_config: SingleSimConfig): 
            else:

                print('Cooling model not enabled... skipping output of plot')



        if 'net' in sim_config.plot:

            if engine.network_model:

                plot_network_graph(

                    engine.network_model.net_graph,

                    out / f'{engine.system_config.system_name}_network.png',

                )

            else:

                print('Network model not enabled... skipping output of plot')



    if out:

        if sim_config.uncertainties:

            # Parquet cannot handle annotated ufloat format AFAIK