Changeset 1014:aae850a2394d in lemon-0.x

Timestamp:

11/20/04 15:23:27 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

Modifications for hugo 0.2

Location:

src/work/marci/lp

Files:

• lp_solver_wrapper.h (modified) (1 diff)
• makefile (modified) (1 diff)
• max_flow_by_lp.cc (modified) (11 diffs)

src/work/marci/lp/lp_solver_wrapper.h

@@ -11 +11 @@
 // #include <stdio>
 //#include <stdlib>
+extern "C" {
 #include "glpk.h"
+}
 
 #include <iostream>

src/work/marci/lp/makefile

@@ -6 +6 @@
 LDFLAGS  = -L$(GLPKROOT)/lib -lglpk
 
-BINARIES = max_flow_by_lp sample sample2 sample11 sample15
+BINARIES = max_flow_by_lp# sample sample2 sample11 sample15
 
 #include ../makefile

src/work/marci/lp/max_flow_by_lp.cc

@@ -3 +3 @@
 #include <fstream>
 
-#include <sage_graph.h>
 #include <lemon/smart_graph.h>
+#include <lemon/list_graph.h>
 #include <lemon/dimacs.h>
 #include <lemon/time_measure.h>
 //#include <graph_wrapper.h>
-#include <lemon/max_flow.h>
+#include <lemon/preflow.h>
 #include <augmenting_flow.h>
 //#include <preflow_res.h>
-#include <for_each_macros.h>
 #include <lp_solver_wrapper.h>
 
@@ -34 +33 @@
 int main(int, char **) {
 
-  typedef SageGraph MutableGraph;
-  //typedef SmartGraph Graph;
-  typedef SageGraph Graph;
+  typedef ListGraph MutableGraph;
+  typedef SmartGraph Graph;
   typedef Graph::Node Node;
   typedef Graph::EdgeIt EdgeIt;
@@ -48 +46 @@
   Timer ts;
   Graph::EdgeMap<int> flow(g); //0 flow
-  MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
+  Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
     max_flow_test(g, s, t, cap, flow);
   AugmentingFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
@@ -61 +59 @@
     std::cout << "elapsed time: " << ts << std::endl;
     std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
-    max_flow_test.actMinCut(cut);
-
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) {
+    max_flow_test.minCut(cut);
+
+    for (Graph::EdgeIt e(g); e!=INVALID; ++e) {
       if (cut[g.source(e)] && !cut[g.target(e)] && !flow[e]==cap[e]) 
         std::cout << "Slackness does not hold!" << std::endl;
@@ -75 +73 @@
 //     FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
 //     ts.reset();
-//     max_flow_test.preflow(MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >::GEN_FLOW);
+//     max_flow_test.preflow(Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >::GEN_FLOW);
 //     std::cout << "elapsed time: " << ts << std::endl;
 //     std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
@@ -98 +96 @@
   {
     std::cout << "physical blocking flow augmentation ..." << std::endl;
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
+    for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
     ts.reset();
     int i=0;
@@ -106 +104 @@
     std::cout << "flow value: "<< augmenting_flow_test.flowValue() << std::endl;
 
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) {
+    for (Graph::EdgeIt e(g); e!=INVALID; ++e) {
       if (cut[g.source(e)] && !cut[g.target(e)] && !flow[e]==cap[e]) 
         std::cout << "Slackness does not hold!" << std::endl;
@@ -127 +125 @@
   {
     std::cout << "on-the-fly blocking flow augmentation ..." << std::endl;
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
+    for (Graph::EdgeIt e(g); e!=INVALID; ++e) flow.set(e, 0);
     ts.reset();
     int i=0;
@@ -135 +133 @@
     std::cout << "flow value: "<< augmenting_flow_test.flowValue() << std::endl;
 
-    FOR_EACH_LOC(Graph::EdgeIt, e, g) {
+    for (Graph::EdgeIt e(g); e!=INVALID; ++e) {
       if (cut[g.source(e)] && !cut[g.target(e)] && !flow[e]==cap[e]) 
         std::cout << "Slackness does not hold!" << std::endl;
@@ -187 +185 @@
   EdgeIndexMap edge_index_map(g);
   PrimalMap<Graph::Edge, EdgeIndexMap> lp_flow(lp, edge_index_map);
-  Graph::EdgeIt e;
-  for (g.first(e); g.valid(e); g.next(e)) {
+  for (Graph::EdgeIt e(g); e!=INVALID; ++e) {
     ColIt col_it=lp.addCol();
     edge_index_map.set(e, col_it);
     lp.setColBounds(col_it, LPX_DB, 0.0, cap[e]);
   }
-  Graph::NodeIt n;
-  for (g.first(n); g.valid(n); g.next(n)) {
+  for (Graph::NodeIt n(g); n!=INVALID; ++n) {
     if (n!=s) {
       //hurokelek miatt
       Graph::EdgeMap<int> coeffs(g, 0);
-      {
-        Graph::InEdgeIt e;
-        for (g.first(e, n); g.valid(e); g.next(e)) coeffs.set(e, coeffs[e]+1);
-      }
-      {
-        Graph::OutEdgeIt e;
-        for (g.first(e, n); g.valid(e); g.next(e)) coeffs.set(e, coeffs[e]-1);
-      }
+      for (Graph::InEdgeIt e(g, n); e!=INVALID; ++e) 
+        coeffs.set(e, coeffs[e]+1);
+      for (Graph::OutEdgeIt e(g, n); e!=INVALID; ++e) 
+        coeffs.set(e, coeffs[e]-1);
       if (n==t) {
-        Graph::EdgeIt e;
-        //std::vector< std::pair<ColIt, double> > row;
-        for (g.first(e); g.valid(e); g.next(e)) {
+        for (Graph::EdgeIt e(g); e!=INVALID; ++e) {
           if (coeffs[e]!=0) 
             lp.setObjCoef(edge_index_map[e], coeffs[e]);
@@ -215 +205 @@
       } else  {
         RowIt row_it=lp.addRow();
-        Graph::EdgeIt e;
         std::vector< std::pair<ColIt, double> > row;
-        for (g.first(e); g.valid(e); g.next(e)) {
+        for (Graph::EdgeIt e(g); e!=INVALID; ++e) {
           if (coeffs[e]!=0) 
             row.push_back(std::make_pair(edge_index_map[e], coeffs[e]));