Changeset 640:6c408d864fa1 in lemon-main for tools

Timestamp:

04/29/09 03:15:24 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Support negative costs and bounds in NetworkSimplex? (#270)

• The interface is reworked to support negative costs and bounds.
  • ProblemType? and problemType() are renamed to SupplyType? and supplyType(), see also #234.
  • ProblemType? type is introduced similarly to the LP interface.
  • 'bool run()' is replaced by 'ProblemType? run()' to handle unbounded problem instances, as well.
  • Add INF public member constant similarly to the LP interface.
• Remove capacityMap() and boundMaps(), see also #266.
• Update the problem definition in the MCF module.
• Remove the usage of Circulation (and adaptors) for checking feasibility. Check feasibility by examining the artifical arcs instead (after solving the problem).
• Additional check for unbounded negative cycles found during the algorithm (it is possible now, since negative costs are allowed).
• Fix in the constructor (the value types needn't be integer any more), see also #254.
• Improve and extend the doc.
• Rework the test file and add test cases for negative costs and bounds.

File:

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

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();