Changeset 561:6e0525ec5355 in lemon-1.2 for tools

Timestamp:

03/30/09 17:46:37 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

562:538b3dd9a2c0, 1005:f37f0845cf32

Phase:

public

Message:

Accept negative values as unbounded capacity in dimacs readers (#243)
and some doc improvements.

Location:

tools

Files:

• dimacs-solver.cc (modified) (5 diffs)
• dimacs-to-lgf.cc (modified) (2 diffs)

tools/dimacs-solver.cc

@@ -73 +73 @@
 template<class Value>
 void solve_max(ArgParser &ap, std::istream &is, std::ostream &,
-              DimacsDescriptor &desc)
+               Value infty, DimacsDescriptor &desc)
 {
   bool report = !ap.given("q");
@@ -81 +81 @@
   Timer ti;
   ti.restart();
-  readDimacsMax(is, g, cap, s, t, desc);
+  readDimacsMax(is, g, cap, s, t, infty, desc);
   if(report) std::cerr << "Read the file: " << ti << '\n';
   ti.restart();
@@ -116 +116 @@
            DimacsDescriptor &desc)
 {
+  std::stringstream iss(ap["infcap"]);
+  Value infty;
+  iss >> infty;
+  if(iss.fail())
+    {
+      std::cerr << "Cannot interpret '"
+                << static_cast<std::string>(ap["infcap"]) << "' as infinite"
+                << std::endl;
+      exit(1);
+    }
+  
   switch(desc.type)
     {
@@ -123 +134 @@
       break;
     case DimacsDescriptor::MAX:
-      solve_max<Value>(ap,is,os,desc);
+      solve_max<Value>(ap,is,os,infty,desc);
       break;
     case DimacsDescriptor::SP:
@@ -160 +171 @@
     .optionGroup("datatype","ldouble")
     .onlyOneGroup("datatype")
+    .stringOption("infcap","Value used for 'very high' capacities","0")
     .run();
 

tools/dimacs-to-lgf.cc

@@ -97 +97 @@
         DoubleArcMap lower(digraph), capacity(digraph), cost(digraph);
         DoubleNodeMap supply(digraph);
-        readDimacsMin(is, digraph, lower, capacity, cost, supply, desc);
+        readDimacsMin(is, digraph, lower, capacity, cost, supply, 0, desc);
         DigraphWriter<Digraph>(digraph, os).
           nodeMap("supply", supply).
@@ -112 +112 @@
         Node s, t;
         DoubleArcMap capacity(digraph);
-        readDimacsMax(is, digraph, capacity, s, t, desc);
+        readDimacsMax(is, digraph, capacity, s, t, 0, desc);
         DigraphWriter<Digraph>(digraph, os).
           arcMap("capacity", capacity).