Update app.py

app.py

@@ -1,128 +1,21 @@
 import streamlit as st
-import networkx as nx
 import matplotlib.pyplot as plt
+import networkx as nx
+import numpy as np
 
 # Sidebar for selecting an option
 sidebar_option = st.sidebar.radio("Select an option", 
                                  ["Select an option", "Basic: Properties", 
                                   "Basic: Read and write graphs", "Basic: Simple graph", 
-                                  "Basic: Simple graph Directed", "Drawing: Custom Node Position", 
-                                  "Drawing: Chess Masters", "Drawing: Cluster Layout"])
+                                  "Basic: Simple graph Directed", "Drawing: Custom Node Position"])
 
 # Helper function to draw and display graph
-def draw_graph(G, pos=None, title="Graph Visualization", edgewidth=None, nodesize=None):
-    if edgewidth is None:
-        edgewidth = [1] * len(G.edges())  # Default edge width if not provided
-
-    if nodesize is None:
-        nodesize = [300] * len(G.nodes())  # Default node size if not provided
-
-    plt.figure(figsize=(12, 12))
-    nx.draw_networkx_edges(G, pos, alpha=0.3, width=edgewidth, edge_color="m")
-    nx.draw_networkx_nodes(G, pos, node_size=nodesize, node_color="#210070", alpha=0.9)
-    label_options = {"ec": "k", "fc": "white", "alpha": 0.7}
-    nx.draw_networkx_labels(G, pos, font_size=14, bbox=label_options)
-
-    # Title/legend
-    font = {"fontname": "Helvetica", "color": "k", "fontweight": "bold", "fontsize": 14}
-    ax = plt.gca()
-    ax.set_title(title, font)
-    ax.text(
-        0.80,
-        0.10,
-        "edge width = # games played",
-        horizontalalignment="center",
-        transform=ax.transAxes,
-        fontdict=font,
-    )
-    ax.text(
-        0.80,
-        0.06,
-        "node size = # games won",
-        horizontalalignment="center",
-        transform=ax.transAxes,
-        fontdict=font,
-    )
-
-    # Resize figure for label readability
-    ax.margins(0.1, 0.05)
-    plt.axis("off")
+def draw_graph(G, pos=None, title="Graph Visualization"):
+    plt.figure(figsize=(8, 6))
+    nx.draw(G, pos=pos, with_labels=True, node_color='lightblue', node_size=500, font_size=10, font_weight='bold')
     st.pyplot(plt)
 
-# Drawing: Cluster Layout
-def display_cluster_layout():
-    st.title("Drawing: Cluster Layout")
-
-    option = st.radio("Choose a graph type:", ("Default Example", "Create your own"))
-
-    if option == "Default Example":
-        G = nx.davis_southern_women_graph()
-
-        # Compute communities using greedy modularity community detection
-        communities = nx.community.greedy_modularity_communities(G)
-
-        # Compute positions for the node clusters as if they were themselves nodes in a supergraph
-        supergraph = nx.cycle_graph(len(communities))
-        superpos = nx.spring_layout(G, scale=50, seed=429)
-
-        # Use the "supernode" positions as the center of each node cluster
-        centers = list(superpos.values())
-        pos = {}
-        for center, comm in zip(centers, communities):
-            pos.update(nx.spring_layout(nx.subgraph(G, comm), center=center, seed=1430))
-
-        # Nodes colored by cluster
-        for nodes, clr in zip(communities, ("tab:blue", "tab:orange", "tab:green")):
-            nx.draw_networkx_nodes(G, pos=pos, nodelist=nodes, node_color=clr, node_size=100)
-        nx.draw_networkx_edges(G, pos=pos)
-
-        plt.tight_layout()
-        st.pyplot(plt)
-
-    elif option == "Create your own":
-        uploaded_file = st.file_uploader("Upload your own graph file (in GML format)", type="gml")
-        if uploaded_file is not None:
-            G_custom = nx.read_gml(uploaded_file)
-            # Compute communities using greedy modularity community detection
-            communities = nx.community.greedy_modularity_communities(G_custom)
-
-            # Compute positions for the node clusters as if they were themselves nodes in a supergraph
-            supergraph = nx.cycle_graph(len(communities))
-            superpos = nx.spring_layout(G_custom, scale=50, seed=429)
-
-            # Use the "supernode" positions as the center of each node cluster
-            centers = list(superpos.values())
-            pos = {}
-            for center, comm in zip(centers, communities):
-                pos.update(nx.spring_layout(nx.subgraph(G_custom, comm), center=center, seed=1430))
-
-            # Nodes colored by cluster
-            for nodes, clr in zip(communities, ("tab:blue", "tab:orange", "tab:green")):
-                nx.draw_networkx_nodes(G_custom, pos=pos, nodelist=nodes, node_color=clr, node_size=100)
-            nx.draw_networkx_edges(G_custom, pos=pos)
-
-            plt.tight_layout()
-            st.pyplot(plt)
-
-# Display other sections
-def display_basic_properties():
-    st.title("Basic: Properties")
-    option = st.radio("Choose a graph type:", ("Default Example", "Create your own"))
-
-    # Default example: 5x5 grid graph
-    if option == "Default Example":
-        G = nx.lollipop_graph(4, 6)
-        display_graph_properties(G)
-
-    elif option == "Create your own":
-        num_nodes = st.number_input("Number of nodes:", min_value=2, max_value=50, value=5)
-        num_edges = st.number_input("Number of edges per group (for lollipop graph):", min_value=1, max_value=10, value=3)
-
-        if st.button("Generate"):
-            if num_nodes >= 2 and num_edges >= 1:
-                G_custom = nx.lollipop_graph(num_nodes, num_edges)
-                display_graph_properties(G_custom)
-
+# Function to display properties and graph for Basic: Properties
 def display_graph_properties(G):
     pathlengths = []
     st.write("### Source vertex {target:length, }")
@@ -137,11 +30,7 @@ def display_graph_properties(G):
 
     dist = {}
     for p in pathlengths:
-        if p in dist:
-            dist[p] += 1
-        else:
-            dist[p] = 1
-
+        dist[p] = dist.get(p, 0) + 1
     st.write("### Length #paths")
     for d in sorted(dist.keys()):
         st.write(f"Length {d}: {dist[d]} paths")
@@ -154,69 +43,188 @@ def display_graph_properties(G):
     st.write(f"Periphery: {nx.periphery(G)}")
     st.write(f"Density: {nx.density(G)}")
 
+    # Visualize the graph
     st.write("### Graph Visualization")
-    pos = nx.spring_layout(G, seed=3068)
-    plt.figure(figsize=(8, 6))
-    nx.draw(G, pos=pos, with_labels=True, node_color='lightblue', node_size=500, font_size=10, font_weight='bold')
+    pos = nx.spring_layout(G, seed=3068)  # Seed layout for reproducibility
+    draw_graph(G, pos)
+
+# Function to display graph for Basic: Read and write graphs
+def display_read_write_graph(G):
+    st.write("### Adjacency List:")
+    for line in nx.generate_adjlist(G):
+        st.write(line)
+    
+    # Write the graph's edge list to a file
+    st.write("### Writing Edge List to 'grid.edgelist' file:")
+    nx.write_edgelist(G, path="grid.edgelist", delimiter=":")
+    st.write("Edge list written to 'grid.edgelist'")
+
+    # Read the graph from the edge list
+    st.write("### Reading Edge List from 'grid.edgelist' file:")
+    H = nx.read_edgelist(path="grid.edgelist", delimiter=":")
+    st.write("Edge list read into graph H")
+
+    # Visualize the graph
+    st.write("### Graph Visualization:")
+    pos = nx.spring_layout(H, seed=200)  # Seed for reproducibility
+    draw_graph(H, pos)
+
+# Function to display Simple Graphs for Basic: Simple graph
+def display_simple_graph(G, pos=None):
+    options = {
+        "font_size": 36,
+        "node_size": 3000,
+        "node_color": "white",
+        "edgecolors": "black",
+        "linewidths": 5,
+        "width": 5,
+    }
+    
+    # Draw the network
+    nx.draw_networkx(G, pos, **options)
+
+    # Set margins for the axes so that nodes aren't clipped
+    ax = plt.gca()
+    ax.margins(0.20)
+    plt.axis("off")
+    st.pyplot(plt)
+
+# Function to display Simple Directed Graphs for Basic: Simple graph Directed
+def display_simple_directed_graph(G, pos=None):
+    options = {
+        "node_size": 500,
+        "node_color": "lightblue",
+        "arrowsize": 20,
+        "width": 2,
+        "edge_color": "gray",
+    }
+    
+    # Draw the directed graph with the given positions and options
+    nx.draw_networkx(G, pos, **options)
+
+    # Set margins for the axes so that nodes aren't clipped
+    ax = plt.gca()
+    ax.margins(0.20)
+    plt.axis("off")
     st.pyplot(plt)
 
-# Display other sections
-def display_read_write_graph():
+# Function to display Custom Node Position Graphs for Drawing: Custom Node Position
+def display_custom_node_position():
+    st.title("Drawing: Custom Node Position")
+    
+    # Default example graph (path graph with custom node position)
+    G = nx.path_graph(20)
+    center_node = 5
+    edge_nodes = set(G) - {center_node}
+    
+    # Ensure the nodes around the circle are evenly distributed
+    pos = nx.circular_layout(G.subgraph(edge_nodes))
+    pos[center_node] = np.array([0, 0])  # Manually specify node position
+    
+    # Draw the graph
+    draw_graph(G, pos)
+
+# Display Basic: Properties if selected
+if sidebar_option == "Basic: Properties":
+    st.title("Basic: Properties")
+    option = st.radio("Choose a graph type:", ("Default Example", "Create your own"))
+
+    if option == "Default Example":
+        G = nx.lollipop_graph(4, 6)
+        display_graph_properties(G)
+
+    elif option == "Create your own":
+        num_nodes = st.number_input("Number of nodes:", min_value=2, max_value=50, value=5)
+        num_edges = st.number_input("Number of edges per group (for lollipop graph):", min_value=1, max_value=10, value=3)
+
+        if st.button("Generate"):
+            if num_nodes >= 2 and num_edges >= 1:
+                G_custom = nx.lollipop_graph(num_nodes, num_edges)
+                display_graph_properties(G_custom)
+
+# Display Basic: Read and write graphs if selected
+elif sidebar_option == "Basic: Read and write graphs":
     st.title("Basic: Read and write graphs")
-    G = nx.karate_club_graph()
+    option = st.radio("Choose a graph type:", ("Default Example", "Create your own"))
 
-    # Write the graph
-    nx.write_gml(G, "karate_club.gml")
-    st.write("Graph written to 'karate_club.gml'.")
+    if option == "Default Example":
+        G = nx.grid_2d_graph(5, 5)
+        display_read_write_graph(G)
 
-    # Read the graph back
-    G_new = nx.read_gml("karate_club.gml")
-    st.write("Graph read back from 'karate_club.gml'.")
-    nx.draw(G_new, with_labels=True)
-    st.pyplot(plt)
+    elif option == "Create your own":
+        rows = st.number_input("Number of rows:", min_value=2, max_value=20, value=5)
+        cols = st.number_input("Number of columns:", min_value=2, max_value=20, value=5)
 
-def display_simple_graph():
+        if st.button("Generate"):
+            if rows >= 2 and cols >= 2:
+                G_custom = nx.grid_2d_graph(rows, cols)
+                display_read_write_graph(G_custom)
+
+# Display Basic: Simple Graph if selected
+elif sidebar_option == "Basic: Simple graph":
     st.title("Basic: Simple graph")
-    G = nx.complete_graph(5)
-    nx.draw(G, with_labels=True)
-    st.pyplot(plt)
+    option = st.radio("Choose a graph type:", ("Default Example", "Create your own"))
+
+    if option == "Default Example":
+        G = nx.Graph()
+        G.add_edge(1, 2)
+        G.add_edge(1, 3)
+        G.add_edge(1, 5)
+        G.add_edge(2, 3)
+        G.add_edge(3, 4)
+        G.add_edge(4, 5)
+
+        pos = {1: (0, 0), 2: (-1, 0.3), 3: (2, 0.17), 4: (4, 0.255), 5: (5, 0.03)}
+        display_simple_graph(G, pos)
+
+    elif option == "Create your own":
+        edges = []
+        edge_input = st.text_area("Edges:", value="1,2\n1,3\n2,3")
+        if edge_input:
+            edge_list = edge_input.split("\n")
+            for edge in edge_list:
+                u, v = map(int, edge.split(","))
+                edges.append((u, v))
+
+        if st.button("Generate"):
+            G_custom = nx.Graph()
+            G_custom.add_edges_from(edges)
+            pos = nx.spring_layout(G_custom, seed=42)
+            display_simple_graph(G_custom, pos)
 
-def display_simple_directed_graph():
+# Display Basic: Simple Directed Graph if selected
+elif sidebar_option == "Basic: Simple graph Directed":
     st.title("Basic: Simple graph Directed")
-    G = nx.complete_graph(5, nx.DiGraph())
-    nx.draw(G, with_labels=True)
-    st.pyplot(plt)
+    option = st.radio("Choose a graph type:", ("Default Example", "Create your own"))
 
-def display_custom_node_position():
-    st.title("Drawing: Custom Node Position")
+    if option == "Default Example":
+        G = nx.DiGraph([(0, 3), (1, 3), (2, 4), (3, 5), (3, 6), (4, 6), (5, 6)])
 
-    # Create a graph with a few nodes and edges
-    G = nx.Graph()
-    G.add_edges_from([("A", "B"), ("B", "C"), ("C", "A")])
+        left_nodes = [0, 1, 2]
+        middle_nodes = [3, 4]
+        right_nodes = [5, 6]
 
-    # Define custom positions for the nodes
-    pos = {"A": (1, 2), "B": (2, 3), "C": (3, 1)}
+        pos = {n: (0, i) for i, n in enumerate(left_nodes)}
+        pos.update({n: (1, i + 0.5) for i, n in enumerate(middle_nodes)})
+        pos.update({n: (2, i + 0.5) for i, n in enumerate(right_nodes)})
 
-    # Draw the graph with the custom positions
-    nx.draw(G, pos=pos, with_labels=True, node_color='lightblue', node_size=500, font_size=10, font_weight='bold')
-    st.pyplot(plt)
+        display_simple_directed_graph(G, pos)
 
+    elif option == "Create your own":
+        edges = []
+        edge_input = st.text_area("Edges:", value="1,2\n1,3\n2,3")
+        if edge_input:
+            edge_list = edge_input.split("\n")
+            for edge in edge_list:
+                u, v = map(int, edge.split(","))
+                edges.append((u, v))
 
+        if st.button("Generate"):
+            G_custom = nx.DiGraph()
+            G_custom.add_edges_from(edges)
+            pos = nx.spring_layout(G_custom, seed=42)
+            display_simple_directed_graph(G_custom, pos)
 
-# Call the appropriate function based on sidebar selection
-if sidebar_option == "Basic: Properties":
-    display_basic_properties()
-elif sidebar_option == "Basic: Read and write graphs":
-    display_read_write_graph()
-elif sidebar_option == "Basic: Simple graph":
-    display_simple_graph()
-elif sidebar_option == "Basic: Simple graph Directed":
-    display_simple_directed_graph()
+# Display Drawing: Custom Node Position if selected
 elif sidebar_option == "Drawing: Custom Node Position":
-    display_custom_node_position()
-elif sidebar_option == "Drawing: Chess Masters":
-    display_chess_masters_graph()
-elif sidebar_option == "Drawing: Cluster Layout":
-    display_cluster_layout()
-else:
-    st.write("Please select a valid option from the sidebar.")
+    display_custom_node_position()