Changeset 119:9b3345f9d8ed in lemon-0.x for src/work

Timestamp:

02/23/04 12:17:41 (21 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

Alpar, nezz bele

File:

• src/work/athos/preflow_push.hh (modified) (8 diffs)

src/work/athos/preflow_push.hh

@@ -9 +9 @@
 //#include <marci_graph_traits.hh>
 
-#include "reverse_bfs.hh"
+#include <reverse_bfs.hh>
 
 using namespace std;
@@ -176 +176 @@
     //(depending on the implementation to be used)
     NodeIt get_active_node(){
-      //cout<<highest_active<<endl;
+      
 
       switch(implementation) {
@@ -187 +187 @@
 
         if( highest_active>=0) {
+          
+
           NodeIt a=active_nodes[highest_active].front();
           active_nodes[highest_active].pop_front();
+          
           return a;
         }
@@ -305 +308 @@
     //then it is an edge in the residual graph
     bool is_admissible_forward_edge(OutEdgeIt j, int& new_level){
+
       if (capacity.get(j)>preflow.get(j)){
         if(level.get(G.tail(j))==level.get(G.head(j))+1){
@@ -320 +324 @@
     //then the edge reversd is an edge in the residual graph
     bool is_admissible_backward_edge(InEdgeIt j, int& new_level){
+      
       if (0<preflow.get(j)){
         if(level.get(G.tail(j))==level.get(G.head(j))-1){
+         
           return true;
         }
@@ -340 +346 @@
     
     preprocess();
-    
+    //write_property_vector(level,"level");
     T e,v;
     NodeIt a;
     while (a=get_active_node(), a.valid()){
+      
       //cout<<G.id(a)<<endl;
       //write_property_vector(excess,"excess");
@@ -352 +359 @@
       e = excess.get(a);
       while (!go_to_next_node){
-
         //Initial value for the new level for the active node we are dealing with
         int new_level=2*number_of_nodes;
@@ -392 +398 @@
         }
 
+        //if (G.id(a)==999)
+        //cout<<new_level<<" e: "<<e<<endl;
         //cout<<G.id(a)<<" "<<new_level<<endl;