Changeset 691:8d289c89d43e in lemon
- Timestamp:
- 04/29/09 18:48:41 (15 years ago)
- Branch:
- default
- Parents:
- 690:f3792d5bb294 (diff), 686: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
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
tools/dimacs-solver.cc
r674 r691 120 120 ti.restart(); 121 121 NetworkSimplex<Digraph, Value> ns(g); 122 ns.lowerMap(lower). capacityMap(cap).costMap(cost).supplyMap(sup);123 if (sum_sup > 0) ns. problemType(ns.LEQ);122 ns.lowerMap(lower).upperMap(cap).costMap(cost).supplyMap(sup); 123 if (sum_sup > 0) ns.supplyType(ns.LEQ); 124 124 if (report) std::cerr << "Setup NetworkSimplex class: " << ti << '\n'; 125 125 ti.restart(); -
tools/dimacs-solver.cc
r687 r691 201 201 .boolOption("int","Use 'int' for capacities, costs etc. (default)") 202 202 .optionGroup("datatype","int") 203 #ifdef HAVE_LONG_LONG203 #ifdef LEMON_HAVE_LONG_LONG 204 204 .boolOption("long","Use 'long long' for capacities, costs etc.") 205 205 .optionGroup("datatype","long") … … 268 268 else if(ap.given("ldouble")) 269 269 solve<long double>(ap,is,os,desc); 270 #ifdef HAVE_LONG_LONG270 #ifdef LEMON_HAVE_LONG_LONG 271 271 else if(ap.given("long")) 272 272 solve<long long>(ap,is,os,desc);
Note: See TracChangeset
for help on using the changeset viewer.