Changeset 1025:3b1ad8bc21da in lemon-0.x for src/work/marci/lp/min_cost_gen_flow.h

Timestamp:

11/29/04 18:55:46 (19 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

MergeGraphWrapper? bug fixes

File:

• src/work/marci/lp/min_cost_gen_flow.h (modified) (2 diffs)

src/work/marci/lp/min_cost_gen_flow.h

@@ -2 +2 @@
 #ifndef LEMON_MIN_COST_GEN_FLOW_H
 #define LEMON_MIN_COST_GEN_FLOW_H
-//#include <iostream>
+#include <iostream>
 //#include <fstream>
 
-//#include <lemon/smart_graph.h>
-//#include <lemon/list_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/preflow.h>
+#include <lemon/preflow.h>
 //#include <augmenting_flow.h>
 //#include <preflow_res.h>
+#include <../merge_node_graph_wrapper.h>
 #include <lemon/../work/marci/lp/lp_solver_wrapper.h>
 
@@ -52 +53 @@
       g(_g), excess(_excess), lcapacity(_lcapacity),
       capacity(_capacity), flow(_flow), cost(_cost) { }
+    bool feasible() {
+      //      std::cout << "making new vertices..." << std::endl; 
+      typedef ListGraph Graph2;
+      Graph2 g2;
+      typedef MergeEdgeGraphWrapper<const Graph, Graph2> GW;
+      //      std::cout << "merging..." << std::endl; 
+      GW gw(g, g2);
+      typename GW::Node s(INVALID, g2.addNode(), true);
+      typename GW::Node t(INVALID, g2.addNode(), true);
+      typedef SmartGraph Graph3;
+      //      std::cout << "making extender graph..." << std::endl; 
+      typedef NewEdgeSetGraphWrapper2<GW, Graph3> GWW;
+//       {
+//      checkConcept<StaticGraph, GWW>();   
+//       }
+      GWW gww(gw);
+      typedef AugmentingGraphWrapper<GW, GWW> GWWW;
+      GWWW gwww(gw, gww);
+
+      //      std::cout << "making new edges..." << std::endl; 
+      typename GWWW::template EdgeMap<Num> translated_cap(gwww);
+
+      for (typename GW::EdgeIt e(gw); e!=INVALID; ++e)
+      translated_cap.set(typename GWWW::Edge(e,INVALID,false), 
+                         capacity[e]-lcapacity[e]);
+
+      Num expected=0;
+
+      //      std::cout << "making new edges 2..." << std::endl; 
+      for (typename Graph::NodeIt n(g); n!=INVALID; ++n) {
+        Num a=0;
+        for (typename Graph::InEdgeIt e(g, n); e!=INVALID; ++e)
+          a+=lcapacity[e];
+        for (typename Graph::OutEdgeIt e(g, n); e!=INVALID; ++e) 
+          a-=lcapacity[e];
+        if (excess[n]>a) {
+          typename GWW::Edge e=
+            gww.addEdge(typename GW::Node(n,INVALID,false), t);
+          translated_cap.set(typename GWWW::Edge(INVALID, e, true), 
+                             excess[n]-a);
+        }
+        if (excess[n]<a) {
+          typename GWW::Edge e=
+            gww.addEdge(s, typename GW::Node(n,INVALID,false));
+          translated_cap.set(typename GWWW::Edge(INVALID, e, true), 
+                             a-excess[n]);
+          expected+=a-excess[n];
+        }
+      }
+
+      //      std::cout << "preflow..." << std::endl; 
+      typename GWWW::template EdgeMap<Num> translated_flow(gwww, 0);
+      Preflow<GWWW, Num> preflow(gwww, s, t, 
+                                 translated_cap, translated_flow);
+      preflow.run();
+      //      std::cout << "fv: " << preflow.flowValue() << std::endl; 
+      //      std::cout << "expected: " << expected << std::endl; 
+
+      for (typename Graph::EdgeIt e(g); e!=INVALID; ++e) {
+        typename GW::Edge ew(e, INVALID, false);
+        typename GWWW::Edge ewww(ew, INVALID, false);
+        flow.set(e, translated_flow[ewww]+lcapacity[e]);
+      }
+      return (expected>=preflow.flowValue());
+    }
     void run() {
       LPSolverWrapper lp;