[Lemon-commits] [lemon_svn] alpar: r1139 - in hugo/trunk/src: benchmark hugo

[Lemon SVN]

Author: alpar
Date: Mon Sep 13 19:14:03 2004
New Revision: 1139

Modified:
   hugo/trunk/src/benchmark/hcube.cc
   hugo/trunk/src/hugo/Makefile.am

Log:
Change MaxFlow to Preflow.

Modified: hugo/trunk/src/benchmark/hcube.cc
==============================================================================
--- hugo/trunk/src/benchmark/hcube.cc	(original)
+++ hugo/trunk/src/benchmark/hcube.cc	Mon Sep 13 19:14:03 2004
@@ -4,7 +4,7 @@
 #include<hugo/list_graph.h>
 #include<hugo/smart_graph.h>
 #include<hugo/dijkstra.h>
-#include<hugo/max_flow.h>
+#include<hugo/preflow.h>
 
 #include"bench_tools.h"
 
@@ -91,7 +91,7 @@
   {
    Graph::EdgeMap<int> flow(G);
    
-    MaxFlow<Graph,int> MF(G,nodes[0],nodes[1<<dim-1],map,flow);
+    Preflow<Graph,int> MF(G,nodes[0],nodes[1<<dim-1],map,flow);
     for(int i=0;i<10;i++)
       MF.run(MF.NO_FLOW);
   }

Modified: hugo/trunk/src/hugo/Makefile.am
==============================================================================
--- hugo/trunk/src/hugo/Makefile.am	(original)
+++ hugo/trunk/src/hugo/Makefile.am	Mon Sep 13 19:14:03 2004
@@ -18,9 +18,9 @@
 	map_iterator.h                                                  \
 	map_registry.h                                                  \
 	maps.h								\
-	max_flow.h                                                      \
 	mincostflows.h                                                  \
 	minlengthpaths.h                                                \
+	preflow.h                                                       \
 	smart_graph.h							\
 	sym_map.h                                                       \
 	time_measure.h							\