1.1 --- a/demo/topology_demo.cc	Thu Jan 26 06:44:22 2006 +0000
     1.2 +++ b/demo/topology_demo.cc	Thu Jan 26 15:42:13 2006 +0000
     1.3 @@ -43,13 +43,13 @@
     1.4  
     1.5  
     1.6  void drawConnectedComponents() {
     1.7 -  typedef UndirListGraph Graph;
     1.8 +  typedef ListUGraph Graph;
     1.9    typedef Graph::Node Node;
    1.10  
    1.11    Graph graph;
    1.12    Graph::NodeMap<xy<double> > coords(graph);
    1.13  
    1.14 -  UndirGraphReader<Graph>("undir_components.lgf", graph).
    1.15 +  UGraphReader<Graph>("u_components.lgf", graph).
    1.16      readNodeMap("coordinates_x", xMap(coords)).
    1.17      readNodeMap("coordinates_y", yMap(coords)).
    1.18      run();
    1.19 @@ -59,7 +59,7 @@
    1.20    Graph::NodeMap<int> compMap(graph);
    1.21    connectedComponents(graph, compMap);
    1.22  
    1.23 -  graphToEps(graph, "connected_components.eps").undir().
    1.24 +  graphToEps(graph, "connected_components.eps").u().
    1.25      coords(coords).scaleToA4().enableParallel().
    1.26      parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0).
    1.27      nodeColors(composeMap(colorSet, compMap)).run();
    1.28 @@ -97,25 +97,25 @@
    1.29  }
    1.30  
    1.31  void drawNodeBiconnectedComponents() {
    1.32 -  typedef UndirListGraph Graph;
    1.33 +  typedef ListUGraph Graph;
    1.34    typedef Graph::Node Node;
    1.35 -  typedef Graph::UndirEdge UndirEdge;
    1.36 +  typedef Graph::UEdge UEdge;
    1.37  
    1.38    Graph graph;
    1.39    Graph::NodeMap<xy<double> > coords(graph);
    1.40  
    1.41 -  UndirGraphReader<Graph>("undir_components.lgf", graph).
    1.42 +  UGraphReader<Graph>("u_components.lgf", graph).
    1.43      readNodeMap("coordinates_x", xMap(coords)).
    1.44      readNodeMap("coordinates_y", yMap(coords)).
    1.45      run();
    1.46  
    1.47    ColorSet colorSet;
    1.48  
    1.49 -  Graph::UndirEdgeMap<int> compMap(graph);
    1.50 +  Graph::UEdgeMap<int> compMap(graph);
    1.51    Graph::NodeMap<bool> cutMap(graph);
    1.52    biNodeConnectedComponents(graph, compMap);
    1.53    biNodeConnectedCutNodes(graph, cutMap);
    1.54 -  graphToEps(graph, "bi_node_connected_components.eps").undir().
    1.55 +  graphToEps(graph, "bi_node_connected_components.eps").u().
    1.56      coords(coords).scaleToA4().enableParallel().
    1.57      parEdgeDist(20.0).edgeWidthScale(5.0).nodeScale(20.0).
    1.58      edgeColors(composeMap(colorSet, compMap)).
    1.59 @@ -126,14 +126,14 @@
    1.60  }
    1.61  
    1.62  void drawEdgeBiconnectedComponents() {
    1.63 -  typedef UndirListGraph Graph;
    1.64 +  typedef ListUGraph Graph;
    1.65    typedef Graph::Node Node;
    1.66 -  typedef Graph::UndirEdge UndirEdge;
    1.67 +  typedef Graph::UEdge UEdge;
    1.68  
    1.69    Graph graph;
    1.70    Graph::NodeMap<xy<double> > coords(graph);
    1.71  
    1.72 -  UndirGraphReader<Graph>("undir_components.lgf", graph).
    1.73 +  UGraphReader<Graph>("u_components.lgf", graph).
    1.74      readNodeMap("coordinates_x", xMap(coords)).
    1.75      readNodeMap("coordinates_y", yMap(coords)).
    1.76      run();
    1.77 @@ -141,11 +141,11 @@
    1.78    ColorSet colorSet;
    1.79  
    1.80    Graph::NodeMap<int> compMap(graph);
    1.81 -  Graph::UndirEdgeMap<bool> cutMap(graph);
    1.82 +  Graph::UEdgeMap<bool> cutMap(graph);
    1.83    biEdgeConnectedComponents(graph, compMap);
    1.84    biEdgeConnectedCutEdges(graph, cutMap);
    1.85  
    1.86 -  graphToEps(graph, "bi_edge_connected_components.eps").undir().
    1.87 +  graphToEps(graph, "bi_edge_connected_components.eps").u().
    1.88      coords(coords).scaleToA4().enableParallel().
    1.89      parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0).
    1.90      nodeColors(composeMap(colorSet, compMap)).
    1.91 @@ -155,14 +155,14 @@
    1.92  }
    1.93  
    1.94  void drawBipartitePartitions() {
    1.95 -  typedef UndirListGraph Graph;
    1.96 +  typedef ListUGraph Graph;
    1.97    typedef Graph::Node Node;
    1.98 -  typedef Graph::UndirEdge UndirEdge;
    1.99 +  typedef Graph::UEdge UEdge;
   1.100  
   1.101    Graph graph;
   1.102    Graph::NodeMap<xy<double> > coords(graph);
   1.103  
   1.104 -  UndirGraphReader<Graph>("partitions.lgf", graph).
   1.105 +  UGraphReader<Graph>("partitions.lgf", graph).
   1.106      readNodeMap("coordinates_x", xMap(coords)).
   1.107      readNodeMap("coordinates_y", yMap(coords)).
   1.108      run();
   1.109 @@ -172,7 +172,7 @@
   1.110    Graph::NodeMap<bool> partMap(graph);
   1.111    bipartitePartitions(graph, partMap);
   1.112  
   1.113 -  graphToEps(graph, "bipartite_partitions.eps").undir().
   1.114 +  graphToEps(graph, "bipartite_partitions.eps").u().
   1.115      coords(coords).scaleToA4().enableParallel().
   1.116      parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0).
   1.117      nodeColors(composeMap(functorMap(&color), partMap)).run();