Change MaxFlow to Preflow.
authoralpar
Mon, 13 Sep 2004 17:14:03 +0000
changeset 84010002fa8847a
parent 839 3edf35893a90
child 841 f4c32484dc5b
Change MaxFlow to Preflow.
src/benchmark/hcube.cc
src/hugo/Makefile.am
     1.1 --- a/src/benchmark/hcube.cc	Mon Sep 13 17:13:16 2004 +0000
     1.2 +++ b/src/benchmark/hcube.cc	Mon Sep 13 17:14:03 2004 +0000
     1.3 @@ -4,7 +4,7 @@
     1.4  #include<hugo/list_graph.h>
     1.5  #include<hugo/smart_graph.h>
     1.6  #include<hugo/dijkstra.h>
     1.7 -#include<hugo/max_flow.h>
     1.8 +#include<hugo/preflow.h>
     1.9  
    1.10  #include"bench_tools.h"
    1.11  
    1.12 @@ -91,7 +91,7 @@
    1.13    {
    1.14     Graph::EdgeMap<int> flow(G);
    1.15     
    1.16 -    MaxFlow<Graph,int> MF(G,nodes[0],nodes[1<<dim-1],map,flow);
    1.17 +    Preflow<Graph,int> MF(G,nodes[0],nodes[1<<dim-1],map,flow);
    1.18      for(int i=0;i<10;i++)
    1.19        MF.run(MF.NO_FLOW);
    1.20    }
     2.1 --- a/src/hugo/Makefile.am	Mon Sep 13 17:13:16 2004 +0000
     2.2 +++ b/src/hugo/Makefile.am	Mon Sep 13 17:14:03 2004 +0000
     2.3 @@ -18,9 +18,9 @@
     2.4  	map_iterator.h                                                  \
     2.5  	map_registry.h                                                  \
     2.6  	maps.h								\
     2.7 -	max_flow.h                                                      \
     2.8  	mincostflows.h                                                  \
     2.9  	minlengthpaths.h                                                \
    2.10 +	preflow.h                                                       \
    2.11  	smart_graph.h							\
    2.12  	sym_map.h                                                       \
    2.13  	time_measure.h							\