Changeset 2579:691ce54544c5 in lemon0.x
 Timestamp:
 02/25/08 13:35:06 (14 years ago)
 Branch:
 default
 Phase:
 public
 Convert:
 svn:c9d7d8f590d60310b91f818b3a526b0e/lemon/trunk@3461
 Location:
 lemon
 Files:

 3 edited
Legend:
 Unmodified
 Added
 Removed

lemon/min_cost_flow.h
r2576 r2579 97 97 MinCostFlow( const Graph &graph, 98 98 const CapacityMap &capacity, 99 const CostMap & _ost,99 const CostMap &cost, 100 100 const SupplyMap &supply ) : 101 101 MinCostFlowImpl(graph, capacity, cost, supply) {} … … 105 105 const LowerMap &lower, 106 106 const CapacityMap &capacity, 107 const CostMap & _ost,107 const CostMap &cost, 108 108 Node s, Node t, 109 109 Supply flow_value ) : 
lemon/min_cost_max_flow.h
r2576 r2579 141 141 /// \pre \ref run() must be called before using this function. 142 142 const FlowMap& flowMap() const { 143 return _flow _result;143 return _flow; 144 144 } 145 145 … … 152 152 /// \pre \ref run() must be called before using this function. 153 153 const PotentialMap& potentialMap() const { 154 return _potential _result;154 return _potential; 155 155 } 156 156 … … 163 163 Cost totalCost() const { 164 164 Cost c = 0; 165 for (typename Graph::EdgeIt e( graph); e != INVALID; ++e)165 for (typename Graph::EdgeIt e(_graph); e != INVALID; ++e) 166 166 c += _flow[e] * _cost[e]; 167 167 return c; 
lemon/network_simplex.h
r2575 r2579 135 135 const SCostMap &cost_map, 136 136 const SPotentialMap &pot_map ) : 137 _gr(gr), _cost_map(cost_map), _pot_map(p m) {}137 _gr(gr), _cost_map(cost_map), _pot_map(pot_map) {} 138 138 139 139 ///\e … … 420 420 private: 421 421 422 // State constant for edges at their lower bounds.423 static const int STATE_LOWER = 1;424 // State constant for edges in the spanning tree.425 static const int STATE_TREE = 0;426 // State constant for edges at their upper bounds.427 static const int STATE_UPPER = 1;422 // State constants for edges 423 enum EdgeStateEnum { 424 STATE_UPPER = 1, 425 STATE_TREE = 0, 426 STATE_LOWER = 1 427 }; 428 428 429 429 // Constant for the combined pivot rule.
Note: See TracChangeset
for help on using the changeset viewer.