Changeset 468:3a2cb784750a in lemon-0.x for src/work/jacint

Timestamp:

04/29/04 12:41:56 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

nem irunk olyat hogy "void resetTarget(const Node _t) {t=_t;}" mert az a const az ott jobbara hulyeseg

File:

• src/work/jacint/preflow.h (modified) (13 diffs)

src/work/jacint/preflow.h

@@ -21 +21 @@
 void run()
 
-T flowValue() : returns the value of a maximum flow
+Num flowValue() : returns the value of a maximum flow
 
 void minMinCut(CutMap& M) : sets M to the characteristic vector of the 
@@ -46 +46 @@
 namespace hugo {
 
-  template <typename Graph, typename T, 
-            typename CapMap=typename Graph::template EdgeMap<T>, 
-            typename FlowMap=typename Graph::template EdgeMap<T> >
+  template <typename Graph, typename Num, 
+            typename CapMap=typename Graph::template EdgeMap<Num>, 
+            typename FlowMap=typename Graph::template EdgeMap<Num> >
   class Preflow {
     
@@ -67 +67 @@
     int n;      //the number of nodes of G
     typename Graph::template NodeMap<int> level;      
-    typename Graph::template NodeMap<T> excess; 
+    typename Graph::template NodeMap<Num> excess; 
 
 
@@ -125 +125 @@
           NodeIt v;
           for(g->first(v); g->valid(v); g->next(v)) {
-            T exc=0;
+            Num exc=0;
           
             InEdgeIt e;
@@ -143 +143 @@
         {
           //Counting the excess of t
-          T exc=0;
+          Num exc=0;
           
           InEdgeIt e;
@@ -262 +262 @@
 
     //Returns the maximum value of a flow.
-    T flowValue() {
+    Num flowValue() {
       return excess[t];
     }
@@ -366 +366 @@
     }
 
+    void resetTarget(Node _t) {t=_t;}
+    void resetSource(Node _s) {s=_s;}
+   
+    void resetCap(const CapMap& _cap) {
+      capacity=&_cap;
+    }
     
-    void resetTarget (const Node _t) {t=_t;}
-
-    void resetSource (const Node _s) {s=_s;}
-   
-    void resetCap (const CapMap& _cap) {
-      capacity=&_cap;
-    }
-    
-    void resetFlow (FlowMap& _flow) {
+    void resetFlow(FlowMap& _flow) {
       flow=&_flow;
     }
@@ -385 +383 @@
       
       int lev=level[w];
-      T exc=excess[w];
+      Num exc=excess[w];
       int newlevel=n;       //bound on the next level of w
           
@@ -401 +399 @@
           }
           
-          T cap=(*capacity)[e];
-          T flo=(*flow)[e];
-          T remcap=cap-flo;
+          Num cap=(*capacity)[e];
+          Num flo=(*flow)[e];
+          Num remcap=cap-flo;
           
           if ( remcap >= exc ) { //A nonsaturating push.
@@ -434 +432 @@
             }
             
-            T flo=(*flow)[e];
+            Num flo=(*flow)[e];
             
             if ( flo >= exc ) { //A nonsaturating push.
@@ -495 +493 @@
           for(g->first(e,s); g->valid(e); g->next(e)) 
             {
-              T c=(*capacity)[e];
+              Num c=(*capacity)[e];
               if ( c == 0 ) continue;
               Node w=g->head(e);
@@ -555 +553 @@
           for(g->first(e,s); g->valid(e); g->next(e)) 
             {
-              T rem=(*capacity)[e]-(*flow)[e];
+              Num rem=(*capacity)[e]-(*flow)[e];
               if ( rem == 0 ) continue;
               Node w=g->head(e);
@@ -587 +585 @@
                   NNMap& right, int& b, int& k, const bool what_heur ) {
 
-      T lev=level[w];   
+      Num lev=level[w]; 
       
       Node right_n=right[w];