Changeset 888:cc3590763f7f in lemon-0.x for src/work/marci

Timestamp:

09/20/04 11:05:19 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

 

Location:

src/work/marci

Files:

• augmenting_flow.h (modified) (11 diffs)
• lp/lp_solver_wrapper.h (modified) (1 diff)

src/work/marci/augmenting_flow.h

@@ -10 +10 @@
 #include <hugo/invalid.h>
 #include <hugo/maps.h>
-#include <tight_edge_filter_map.h>
+#include <hugo/tight_edge_filter_map.h>
 
 /// \file
@@ -248 +248 @@
   {
     ResGW res_graph(*g, *capacity, *flow);
+    typename ResGW::ResCap res_cap(res_graph);
+
     bool _augment=false;
 
@@ -268 +270 @@
         pred.set(w, e);
         if (pred[v]!=INVALID) {
-          free.set(w, std::min(free[v], res_graph.resCap(e)));
+          free.set(w, std::min(free[v], res_cap[e]));
         } else {
-          free.set(w, res_graph.resCap(e));
+          free.set(w, res_cap[e]);
         }
         if (res_graph.head(e)==t) { _augment=true; break; }
@@ -296 +298 @@
   {
     ResGW res_graph(*g, *capacity, *flow);
+    typename ResGW::ResCap res_cap(res_graph);
+
     bool _augment=false;
 
@@ -325 +329 @@
         pred.set(w, e);
         if (pred[v]!=INVALID) {
-          free.set(w, std::min(free[v], res_graph.resCap(e)));
+          free.set(w, std::min(free[v], res_cap[e]));
         } else {
-          free.set(w, res_graph.resCap(e));
+          free.set(w, res_cap[e]);
         }
         if (res_graph.head(e)==t) { _augment=true; break; }
@@ -358 +362 @@
 
     ResGW res_graph(*g, *capacity, *flow);
+    typename ResGW::ResCap res_cap(res_graph);
 
     //bfs for distances on the residual graph
@@ -393 +398 @@
           original_edge.set(f, e);
           //residual_capacity.update();
-          residual_capacity.set(f, res_graph.resCap(e));
+          residual_capacity.set(f, res_cap[e]);
         } else {
           if (dist[res_graph.head(e)]==(dist[res_graph.tail(e)]+1)) {
@@ -401 +406 @@
             original_edge.set(f, e);
             //residual_capacity.update();
-            residual_capacity.set(f, res_graph.resCap(e));
+            residual_capacity.set(f, res_cap[e]);
           }
         }
@@ -473 +478 @@
 
     ResGW res_graph(*g, *capacity, *flow);
+    typename ResGW::ResCap res_cap(res_graph);
 
     //Potential map, for distances from s
@@ -550 +556 @@
             if (pred[v]!=INVALID) {
               free1.set
-                (w, std::min(free1[v], res_graph.resCap
-                             (typename ErasingResGW::Edge(dfs))));
+                (w, std::min(free1[v], res_cap
+                             [typename ErasingResGW::Edge(dfs)]));
             } else {
               free1.set
-                (w, res_graph.resCap
-                 (typename ErasingResGW::Edge(dfs)));
+                (w, res_cap
+                 [typename ErasingResGW::Edge(dfs)]);
             }
 
@@ -577 +583 @@
           res_graph.augment(e, augment_value);
           n=erasing_res_graph.tail(e);
-          if (res_graph.resCap(e)==0)
+          if (res_cap[e]==0)
             erasing_res_graph.erase(e);
         }

src/work/marci/lp/lp_solver_wrapper.h

@@ -340 +340 @@
       lpx_set_row_bnds(lp, row_iter_map[row_it], bound_type, lo, up);
     }
-//   void setObjCoef(const RowIt& row_it, double obj_coef) { 
-//     lpx_set_obj_coef(lp, row_iter_map[row_it], obj_coef);
-//   }
+    ///.
+    void setObjCoef(const ColIt& col_it, double obj_coef) { 
+      lpx_set_obj_coef(lp, col_iter_map[col_it], obj_coef);
+    }
     ///.
     void solveSimplex() { lpx_simplex(lp); }