Changeset 644:8d289c89d43e in lemon-main

Timestamp:

04/29/09 18:48:41 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

643:f3792d5bb294 (diff), 639:72ac25ad276e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

Files:

• tools/dimacs-solver.cc (modified) (1 diff)
• tools/dimacs-solver.cc (modified) (2 diffs)

tools/dimacs-solver.cc

@@ -120 +120 @@
   ti.restart();
   NetworkSimplex<Digraph, Value> ns(g);
-  ns.lowerMap(lower).capacityMap(cap).costMap(cost).supplyMap(sup);
-  if (sum_sup > 0) ns.problemType(ns.LEQ);
+  ns.lowerMap(lower).upperMap(cap).costMap(cost).supplyMap(sup);
+  if (sum_sup > 0) ns.supplyType(ns.LEQ);
   if (report) std::cerr << "Setup NetworkSimplex class: " << ti << '\n';
   ti.restart();

tools/dimacs-solver.cc

@@ -201 +201 @@
     .boolOption("int","Use 'int' for capacities, costs etc. (default)")
     .optionGroup("datatype","int")
-#ifdef HAVE_LONG_LONG
+#ifdef LEMON_HAVE_LONG_LONG
     .boolOption("long","Use 'long long' for capacities, costs etc.")
     .optionGroup("datatype","long")
@@ -268 +268 @@
   else if(ap.given("ldouble"))
     solve<long double>(ap,is,os,desc);
-#ifdef HAVE_LONG_LONG
+#ifdef LEMON_HAVE_LONG_LONG
   else if(ap.given("long"))
     solve<long long>(ap,is,os,desc);