Changeset 88:93bb934b0794 in lemon-0.x

Timestamp:

02/17/04 12:43:22 (21 years ago)

Author:

jacint

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@115

Message:

fast version

File:

• src/work/jacint/preflow_push_hl.h (modified) (4 diffs)

src/work/jacint/preflow_push_hl.h

@@ -26 +26 @@
 #define PREFLOW_PUSH_HL_H
 
-//#include <algorithm>
+#define A 1
+
 #include <vector>
 #include <stack>
@@ -65 +66 @@
     void run() {
  
+      std::cout<<"A is "<<A<<" ";
+
       typename Graph::NodeMap<int> level(G);      
       typename Graph::NodeMap<T> excess(G); 
@@ -221 +224 @@
               --numb[oldlevel];
 
-              if ( !numb[oldlevel] ) {  //If the level of w gets empty. 
+              if ( !numb[oldlevel] && oldlevel < A*n ) {  //If the level of w gets empty. 
                 
                 for (EachNodeIt v=G.template first<EachNodeIt>(); v.valid() ; ++v) {
@@ -269 +272 @@
     */
 
-    T flowonEdge(EdgeIt e) {
+    T flowonedge(EdgeIt e) {
       return flow.get(e);
     }