1.1 --- a/demo/disjoint_paths_demo.cc	Wed Nov 14 17:53:08 2007 +0000
     1.2 +++ b/demo/disjoint_paths_demo.cc	Sat Nov 17 20:58:11 2007 +0000
     1.3 @@ -63,7 +63,7 @@
     1.4  
     1.5    Graph::EdgeMap<int> flow(graph);
     1.6  
     1.7 -  Preflow<Graph, int, Capacity> preflow(graph, source, target, capacity, flow); 
     1.8 +  Preflow<Graph, Capacity> preflow(graph, capacity, source, target); 
     1.9    
    1.10    preflow.run();
    1.11  
    1.12 @@ -72,7 +72,7 @@
    1.13    graphToEps(graph, "edge_disjoint_paths.eps").
    1.14      title("edge disjoint paths").scaleToA4().
    1.15      copyright("(C) 2003-2007 LEMON Project").drawArrows().
    1.16 -    edgeColors(composeMap(functorMap(color), flow)).
    1.17 +    edgeColors(composeMap(functorMap(color), preflow.flowMap())).
    1.18      coords(coords).run();
    1.19  
    1.20  
    1.21 @@ -87,9 +87,9 @@
    1.22  
    1.23    SGraph::EdgeMap<int> sflow(sgraph);
    1.24  
    1.25 -  Preflow<SGraph, int, SCapacity> spreflow(sgraph, SGraph::outNode(source), 
    1.26 -                                           SGraph::inNode(target), 
    1.27 -                                           scapacity, sflow);
    1.28 +  Preflow<SGraph, SCapacity> spreflow(sgraph, scapacity, 
    1.29 +				      SGraph::outNode(source), 
    1.30 +				      SGraph::inNode(target));
    1.31  
    1.32    spreflow.run();
    1.33  
    1.34 @@ -99,7 +99,7 @@
    1.35    graphToEps(sgraph, "node_disjoint_paths.eps").
    1.36      title("node disjoint paths").scaleToA4().
    1.37      copyright("(C) 2003-2007 LEMON Project").drawArrows().
    1.38 -    edgeColors(composeMap(functorMap(color), sflow)).
    1.39 +    edgeColors(composeMap(functorMap(color), spreflow.flowMap())).
    1.40      coords(SGraph::combinedNodeMap(coords,
    1.41  				   shiftMap(coords,
    1.42  					    dim2::Point<double>(5, 0)))).