Changeset 2413:21eb3ccdc3df in lemon-0.x for tools/dim_to_lgf.cc

Timestamp:

03/22/07 16:40:50 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Right dimacs format for min cost flows
Bug fixes in tolerance and min_mean_cycle

File:

• tools/dim_to_lgf.cc (modified) (5 diffs)

tools/dim_to_lgf.cc

@@ -47 +47 @@
   typedef Graph::EdgeIt EdgeIt;
   typedef Graph::NodeIt NodeIt;
-  typedef Graph::EdgeMap<double> DoubleMap;
+  typedef Graph::EdgeMap<double> DoubleEdgeMap;
+  typedef Graph::NodeMap<double> DoubleNodeMap;
 
   std::string inputName;
@@ -116 +117 @@
   if (mincostflow) {
     Graph graph;
-    Node s, t;
-    DoubleMap cost(graph), capacity(graph);
-    readDimacs(is, graph, capacity, s, t, cost);
+    DoubleNodeMap supply(graph);
+    DoubleEdgeMap lower(graph), capacity(graph), cost(graph);
+    readDimacs(is, graph, supply, lower, capacity, cost);
     GraphWriter<Graph>(os, graph).
+      writeNodeMap("supply", supply).
+      writeEdgeMap("lower", lower).
       writeEdgeMap("capacity", capacity).
-      writeNode("source", s).
-      writeNode("target", t).
       writeEdgeMap("cost", cost).
       run();
@@ -128 +129 @@
     Graph graph;
     Node s, t;
-    DoubleMap capacity(graph);
+    DoubleEdgeMap capacity(graph);
     readDimacs(is, graph, capacity, s, t);
     GraphWriter<Graph>(os, graph).
@@ -138 +139 @@
     Graph graph;
     Node s;
-    DoubleMap capacity(graph);
+    DoubleEdgeMap capacity(graph);
     readDimacs(is, graph, capacity, s);
     GraphWriter<Graph>(os, graph).
@@ -146 +147 @@
   } else if (capacitated) {
     Graph graph;
-    DoubleMap capacity(graph);
+    DoubleEdgeMap capacity(graph);
     readDimacs(is, graph, capacity);
     GraphWriter<Graph>(os, graph).