Changeset 1026:9312d6c89d02 in lemon
 Timestamp:
 01/10/11 09:34:50 (9 years ago)
 Branch:
 default
 Parents:
 1025:140c953ad5d1 (diff), 1024:745312f9b441 (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
 Location:
 lemon
 Files:

 8 edited
Legend:
 Unmodified
 Added
 Removed

lemon/capacity_scaling.h
r1023 r1026 87 87 /// consider to use the named template parameters instead. 88 88 /// 89 /// \warning Both number types must be signed and all input data must 89 /// \warning Both \c V and \c C must be signed number types. 90 /// \warning All input data (capacities, supply values, and costs) must 90 91 /// be integer. 91 92 /// \warning This algorithm does not support negative costs for 
lemon/capacity_scaling.h
r1025 r1026 90 90 /// \warning All input data (capacities, supply values, and costs) must 91 91 /// be integer. 92 /// \warning This algorithm does not support negative costs for such93 /// arcs that haveinfinite upper bound.92 /// \warning This algorithm does not support negative costs for 93 /// arcs having infinite upper bound. 94 94 #ifdef DOXYGEN 95 95 template <typename GR, typename V, typename C, typename TR> … … 424 424 /// 425 425 /// Using this function has the same effect as using \ref supplyMap() 426 /// with sucha map in which \c k is assigned to \c s, \c k is426 /// with a map in which \c k is assigned to \c s, \c k is 427 427 /// assigned to \c t and all other nodes have zero supply value. 428 428 /// 
lemon/cost_scaling.h
r1023 r1026 117 117 /// consider to use the named template parameters instead. 118 118 /// 119 /// \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 120 121 /// be integer. 121 122 /// \warning This algorithm does not support negative costs for 
lemon/cost_scaling.h
r1025 r1026 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 … … 117 120 /// \warning All input data (capacities, supply values, and costs) must 118 121 /// be integer. 119 /// \warning This algorithm does not support negative costs for such120 /// arcs that haveinfinite upper bound.122 /// \warning This algorithm does not support negative costs for 123 /// arcs having infinite upper bound. 121 124 /// 122 125 /// \note %CostScaling provides three different internal methods, … … 180 183 /// relabel operation. 181 184 /// By default, the so called \ref PARTIAL_AUGMENT 182 /// "Partial AugmentRelabel" method is used, which provedto be185 /// "Partial AugmentRelabel" method is used, which turned out to be 183 186 /// the most efficient and the most robust on various test inputs. 184 187 /// However, the other methods can be selected using the \ref run() … … 449 452 /// 450 453 /// Using this function has the same effect as using \ref supplyMap() 451 /// 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 452 455 /// assigned to \c t and all other nodes have zero supply value. 453 456 /// 
lemon/cycle_canceling.h
r1023 r1026 66 66 /// algorithm. By default, it is the same as \c V. 67 67 /// 68 /// \warning Both number types must be signed and all input data must 68 /// \warning Both \c V and \c C must be signed number types. 69 /// \warning All input data (capacities, supply values, and costs) must 69 70 /// be integer. 70 71 /// \warning This algorithm does not support negative costs for 
lemon/cycle_canceling.h
r1025 r1026 69 69 /// \warning All input data (capacities, supply values, and costs) must 70 70 /// be integer. 71 /// \warning This algorithm does not support negative costs for such72 /// arcs that haveinfinite upper bound.71 /// \warning This algorithm does not support negative costs for 72 /// arcs having infinite upper bound. 73 73 /// 74 74 /// \note For more information about the three available methods, … … 118 118 /// \ref CycleCanceling provides three different cyclecanceling 119 119 /// methods. By default, \ref CANCEL_AND_TIGHTEN "Cancel and Tighten" 120 /// is used, which proved to be the most efficient and the most robust 121 /// on various test inputs. 120 /// is used, which is by far the most efficient and the most robust. 122 121 /// However, the other methods can be selected using the \ref run() 123 122 /// function with the proper parameter. … … 351 350 /// 352 351 /// Using this function has the same effect as using \ref supplyMap() 353 /// with sucha map in which \c k is assigned to \c s, \c k is352 /// with a map in which \c k is assigned to \c s, \c k is 354 353 /// assigned to \c t and all other nodes have zero supply value. 355 354 /// 
lemon/network_simplex.h
r1023 r1026 64 64 /// algorithm. By default, it is the same as \c V. 65 65 /// 66 /// \warning Both number types must be signed and all input data must 66 /// \warning Both \c V and \c C must be signed number types. 67 /// \warning All input data (capacities, supply values, and costs) must 67 68 /// be integer. 68 69 /// 
lemon/network_simplex.h
r1025 r1026 48 48 /// flow problem. 49 49 /// 50 /// In general, %NetworkSimplex is the fastest implementation available51 /// i n LEMON for this problem.52 /// Moreover, it supports both directions of the supply/demand inequality53 /// constraints. For more information, see \ref SupplyType.50 /// In general, \ref NetworkSimplex and \ref CostScaling are the fastest 51 /// implementations available in LEMON for this problem. 52 /// Furthermore, this class supports both directions of the supply/demand 53 /// inequality constraints. For more information, see \ref SupplyType. 54 54 /// 55 55 /// Most of the parameters of the problem (except for the digraph) … … 127 127 /// of the algorithm. 128 128 /// By default, \ref BLOCK_SEARCH "Block Search" is used, which 129 /// provedto be the most efficient and the most robust on various129 /// turend out to be the most efficient and the most robust on various 130 130 /// test inputs. 131 131 /// However, another pivot rule can be selected using the \ref run() … … 169 169 typedef std::vector<Cost> CostVector; 170 170 typedef std::vector<signed char> CharVector; 171 // Note: vector<signed char> is used instead of vector<ArcState> and 171 // Note: vector<signed char> is used instead of vector<ArcState> and 172 172 // vector<ArcDirection> for efficiency reasons 173 173 … … 736 736 /// 737 737 /// \return <tt>(*this)</tt> 738 /// 739 /// \sa supplyType() 738 740 template<typename SupplyMap> 739 741 NetworkSimplex& supplyMap(const SupplyMap& map) { … … 752 754 /// 753 755 /// Using this function has the same effect as using \ref supplyMap() 754 /// with sucha map in which \c k is assigned to \c s, \c k is756 /// with a map in which \c k is assigned to \c s, \c k is 755 757 /// assigned to \c t and all other nodes have zero supply value. 756 758 ///
Note: See TracChangeset
for help on using the changeset viewer.