[Lemon-commits] [lemon_svn] alpar: r1647 - hugo/trunk/src/lemon

[Lemon SVN]

Author: alpar
Date: Sat Mar 19 10:38:31 2005
New Revision: 1647

Modified:
   hugo/trunk/src/lemon/preflow.h

Log:
- A primitive function type interface for Preflow.
- A compilation bug fixed

Modified: hugo/trunk/src/lemon/preflow.h
==============================================================================
--- hugo/trunk/src/lemon/preflow.h	(original)
+++ hugo/trunk/src/lemon/preflow.h	Sat Mar 19 10:38:31 2005
@@ -59,6 +59,7 @@
   ///\param FlowMap The flow map type.
   ///
   ///\author Jacint Szabo 
+  ///\todo Second template parameter is superfluous
   template <typename Graph, typename Num,
 	    typename CapacityMap=typename Graph::template EdgeMap<Num>,
             typename FlowMap=typename Graph::template EdgeMap<Num> >
@@ -407,7 +408,7 @@
 
       std::queue<Node> queue;
       M.set(_source,true);
-      queue.push(s);
+      queue.push(_source);
       
       while (!queue.empty()) {
 	Node w=queue.front();
@@ -845,10 +846,23 @@
     } //relabel
 
   }; 
-} //namespace lemon
-
-#endif //LEMON_PREFLOW_H
 
+  ///Function type interface for Preflow algorithm.
 
+  /// \ingroup flowalgs
+  ///Function type interface for Preflow algorithm.
+  ///\sa Preflow
+  template<class GR, class CM, class FM>
+  Preflow<GR,typename CM::Value,CM,FM> preflow(const GR &g,
+			    typename GR::Node source,
+			    typename GR::Node target,
+			    const CM &cap,
+			    FM &flow
+			    )
+  {
+    return Preflow<GR,typename CM::Value,CM,FM>(g,source,target,cap,flow);
+  }
 
+} //namespace lemon
 
+#endif //LEMON_PREFLOW_H