Changeset 1042:773dd96ecdd8 in lemon for lemon
 Timestamp:
 03/17/11 09:02:51 (9 years ago)
 Branch:
 default
 Parents:
 1040:8e39ccaabf48 (diff), 1041:f112c18bc304 (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

lemon/cost_scaling.h
r1026 r1042 912 912 break; 913 913 case AUGMENT: 914 startAugment( );914 startAugment(_res_node_num  1); 915 915 break; 916 916 case PARTIAL_AUGMENT: … … 1089 1089 1090 1090 /// Execute the algorithm performing augment and relabel operations 1091 void startAugment(int max_length = std::numeric_limits<int>::max()) {1091 void startAugment(int max_length) { 1092 1092 // Paramters for heuristics 1093 1093 const int EARLY_TERM_EPSILON_LIMIT = 1000; 
lemon/cost_scaling.h
r1041 r1042 98 98 /// "preflow pushrelabel" algorithm for the maximum flow problem. 99 99 /// 100 /// In general, \ref NetworkSimplex and \ref CostScaling are the fastest 101 /// implementations available in LEMON for this problem. 102 /// 100 103 /// Most of the parameters of the problem (except for the digraph) 101 104 /// can be given using separate functions, and the algorithm can be … … 114 117 /// consider to use the named template parameters instead. 115 118 /// 116 /// \warning Both number types must be signed and all input data must 119 /// \warning Both \c V and \c C must be signed number types. 120 /// \warning All input data (capacities, supply values, and costs) must 117 121 /// be integer. 118 /// \warning This algorithm does not support negative costs for such119 /// arcs that haveinfinite upper bound.122 /// \warning This algorithm does not support negative costs for 123 /// arcs having infinite upper bound. 120 124 /// 121 125 /// \note %CostScaling provides three different internal methods, … … 179 183 /// relabel operation. 180 184 /// By default, the so called \ref PARTIAL_AUGMENT 181 /// "Partial AugmentRelabel" method is used, which provedto be185 /// "Partial AugmentRelabel" method is used, which turned out to be 182 186 /// the most efficient and the most robust on various test inputs. 183 187 /// However, the other methods can be selected using the \ref run() … … 448 452 /// 449 453 /// Using this function has the same effect as using \ref supplyMap() 450 /// with sucha map in which \c k is assigned to \c s, \c k is454 /// with a map in which \c k is assigned to \c s, \c k is 451 455 /// assigned to \c t and all other nodes have zero supply value. 452 456 ///
Note: See TracChangeset
for help on using the changeset viewer.