COIN-OR::LEMON - Graph Library

Changeset 613:b1811c363299 in lemon-1.2 for lemon


Ignore:
Timestamp:
04/24/09 12:22:06 (11 years ago)
Author:
Peter Kovacs <kpeter@…>
Branch:
default
Phase:
public
Message:

Bug fix in NetworkSimplex? (#234)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/network_simplex.h

    r609 r613  
    11451145      // Run Circulation to check if a feasible solution exists
    11461146      typedef ConstMap<Arc, Flow> ConstArcMap;
     1147      ConstArcMap zero_arc_map(0), inf_arc_map(inf_cap);
    11471148      FlowNodeMap *csup = NULL;
    11481149      bool local_csup = false;
     
    11651166          } else {
    11661167            Circulation<GR, FlowArcMap, ConstArcMap, FlowNodeMap>
    1167               circ(_graph, *_plower, ConstArcMap(inf_cap), *csup);
     1168              circ(_graph, *_plower, inf_arc_map, *csup);
    11681169            circ_result = circ.run();
    11691170          }
     
    11711172          if (_pupper) {
    11721173            Circulation<GR, ConstArcMap, FlowArcMap, FlowNodeMap>
    1173               circ(_graph, ConstArcMap(0), *_pupper, *csup);
     1174              circ(_graph, zero_arc_map, *_pupper, *csup);
    11741175            circ_result = circ.run();
    11751176          } else {
    11761177            Circulation<GR, ConstArcMap, ConstArcMap, FlowNodeMap>
    1177               circ(_graph, ConstArcMap(0), ConstArcMap(inf_cap), *csup);
     1178              circ(_graph, zero_arc_map, inf_arc_map, *csup);
    11781179            circ_result = circ.run();
    11791180          }
     
    11921193          } else {
    11931194            Circulation<RevGraph, FlowArcMap, ConstArcMap, NegNodeMap>
    1194               circ(rgraph, *_plower, ConstArcMap(inf_cap), neg_csup);
     1195              circ(rgraph, *_plower, inf_arc_map, neg_csup);
    11951196            circ_result = circ.run();
    11961197          }
     
    11981199          if (_pupper) {
    11991200            Circulation<RevGraph, ConstArcMap, FlowArcMap, NegNodeMap>
    1200               circ(rgraph, ConstArcMap(0), *_pupper, neg_csup);
     1201              circ(rgraph, zero_arc_map, *_pupper, neg_csup);
    12011202            circ_result = circ.run();
    12021203          } else {
    12031204            Circulation<RevGraph, ConstArcMap, ConstArcMap, NegNodeMap>
    1204               circ(rgraph, ConstArcMap(0), ConstArcMap(inf_cap), neg_csup);
     1205              circ(rgraph, zero_arc_map, inf_arc_map, neg_csup);
    12051206            circ_result = circ.run();
    12061207          }
Note: See TracChangeset for help on using the changeset viewer.