diff -r f40343b498ef -r 4b25e7003868 demo/topology_demo.cc --- a/demo/topology_demo.cc Thu Aug 10 10:11:07 2006 +0000 +++ b/demo/topology_demo.cc Thu Aug 10 10:18:04 2006 +0000 @@ -56,7 +56,7 @@ readNodeMap("coordinates_y", yMap(coords)). run(); - ColorSet colorSet; + Palette palette; Graph::NodeMap compMap(graph); connectedComponents(graph, compMap); @@ -64,7 +64,7 @@ graphToEps(graph, "connected_components.eps").undirected(). coords(coords).scaleToA4().enableParallel(). parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0). - nodeColors(composeMap(colorSet, compMap)).run(); + nodeColors(composeMap(palette, compMap)).run(); std::cout << "Result: connected_components.eps" << std::endl; } @@ -81,7 +81,7 @@ readNodeMap("coordinates_y", yMap(coords)). run(); - ColorSet colorSet; + Palette palette; Graph::NodeMap compMap(graph); Graph::EdgeMap cutMap(graph); @@ -92,7 +92,7 @@ coords(coords).scaleToA4().enableParallel(). drawArrows().arrowWidth(10.0).arrowLength(10.0). parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0). - nodeColors(composeMap(colorSet, compMap)). + nodeColors(composeMap(palette, compMap)). edgeColors(composeMap(functorMap(&color), cutMap)).run(); std::cout << "Result: strongly_connected_components.eps" << std::endl; @@ -111,7 +111,7 @@ readNodeMap("coordinates_y", yMap(coords)). run(); - ColorSet colorSet; + Palette palette; Graph::UEdgeMap compMap(graph); Graph::NodeMap cutMap(graph); @@ -121,7 +121,7 @@ graphToEps(graph, "bi_node_connected_components.eps").undirected(). coords(coords).scaleToA4().enableParallel(). parEdgeDist(20.0).edgeWidthScale(5.0).nodeScale(20.0). - edgeColors(composeMap(colorSet, compMap)). + edgeColors(composeMap(palette, compMap)). nodeColors(composeMap(functorMap(&color), cutMap)). run(); @@ -141,7 +141,7 @@ readNodeMap("coordinates_y", yMap(coords)). run(); - ColorSet colorSet; + Palette palette; Graph::NodeMap compMap(graph); Graph::UEdgeMap cutMap(graph); @@ -151,7 +151,7 @@ graphToEps(graph, "bi_edge_connected_components.eps").undirected(). coords(coords).scaleToA4().enableParallel(). parEdgeDist(20.0).edgeWidthScale(2.0).nodeScale(20.0). - nodeColors(composeMap(colorSet, compMap)). + nodeColors(composeMap(palette, compMap)). edgeColors(composeMap(functorMap(&color), cutMap)).run(); std::cout << "Result: bi_edge_connected_components.eps" << std::endl; @@ -170,7 +170,7 @@ readNodeMap("coordinates_y", yMap(coords)). run(); - ColorSet colorSet; + Palette palette; Graph::NodeMap partMap(graph); bipartitePartitions(graph, partMap);