diff -r 4a2236cc98a0 -r 42cce226b87b demo/topology_demo.cc --- a/demo/topology_demo.cc Tue Nov 21 17:28:08 2006 +0000 +++ b/demo/topology_demo.cc Tue Nov 21 18:22:08 2006 +0000 @@ -36,6 +36,7 @@ /// \include topology_demo.cc using namespace lemon; +using namespace lemon::dim2; using namespace std; @@ -49,7 +50,7 @@ typedef Graph::Node Node; Graph graph; - Graph::NodeMap > coords(graph); + Graph::NodeMap > coords(graph); UGraphReader("u_components.lgf", graph). readNodeMap("coordinates_x", xMap(coords)). @@ -63,7 +64,6 @@ graphToEps(graph, "connected_components.eps").undirected(). coords(coords).scaleToA4().enableParallel(). - parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0). nodeColors(composeMap(palette, compMap)).run(); std::cout << "Result: connected_components.eps" << std::endl; @@ -74,7 +74,7 @@ typedef Graph::Node Node; Graph graph; - Graph::NodeMap > coords(graph); + Graph::NodeMap > coords(graph); GraphReader("dir_components.lgf", graph). readNodeMap("coordinates_x", xMap(coords)). @@ -89,9 +89,7 @@ stronglyConnectedCutEdges(graph, cutMap); graphToEps(graph, "strongly_connected_components.eps"). - coords(coords).scaleToA4().enableParallel(). - drawArrows().arrowWidth(10.0).arrowLength(10.0). - parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0). + coords(coords).scaleToA4().enableParallel().drawArrows(). nodeColors(composeMap(palette, compMap)). edgeColors(composeMap(functorMap(&color), cutMap)).run(); @@ -104,7 +102,7 @@ typedef Graph::UEdge UEdge; Graph graph; - Graph::NodeMap > coords(graph); + Graph::NodeMap > coords(graph); UGraphReader("u_components.lgf", graph). readNodeMap("coordinates_x", xMap(coords)). @@ -120,7 +118,6 @@ graphToEps(graph, "bi_node_connected_components.eps").undirected(). coords(coords).scaleToA4().enableParallel(). - parEdgeDist(20.0).edgeWidthScale(5.0).nodeScale(20.0). edgeColors(composeMap(palette, compMap)). nodeColors(composeMap(functorMap(&color), cutMap)). run(); @@ -134,7 +131,7 @@ typedef Graph::UEdge UEdge; Graph graph; - Graph::NodeMap > coords(graph); + Graph::NodeMap > coords(graph); UGraphReader("u_components.lgf", graph). readNodeMap("coordinates_x", xMap(coords)). @@ -150,7 +147,6 @@ graphToEps(graph, "bi_edge_connected_components.eps").undirected(). coords(coords).scaleToA4().enableParallel(). - parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0). nodeColors(composeMap(palette, compMap)). edgeColors(composeMap(functorMap(&color), cutMap)).run(); @@ -163,7 +159,7 @@ typedef Graph::UEdge UEdge; Graph graph; - Graph::NodeMap > coords(graph); + Graph::NodeMap > coords(graph); UGraphReader("partitions.lgf", graph). readNodeMap("coordinates_x", xMap(coords)). @@ -177,7 +173,6 @@ graphToEps(graph, "bipartite_partitions.eps").undirected(). coords(coords).scaleToA4().enableParallel(). - parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0). nodeColors(composeMap(functorMap(&color), partMap)).run(); std::cout << "Result: bipartite_partitions.eps" << std::endl;