COIN-OR::LEMON - Graph Library

Changeset 1026:9312d6c89d02 in lemon for lemon


Ignore:
Timestamp:
01/10/11 09:34:50 (9 years ago)
Author:
Alpar Juttner <alpar@…>
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
Message:

Merge

Location:
lemon
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • lemon/capacity_scaling.h

    r1023 r1026  
    8787  /// consider to use the named template parameters instead.
    8888  ///
    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
    9091  /// be integer.
    9192  /// \warning This algorithm does not support negative costs for
  • lemon/capacity_scaling.h

    r1025 r1026  
    9090  /// \warning All input data (capacities, supply values, and costs) must
    9191  /// be integer.
    92   /// \warning This algorithm does not support negative costs for such
    93   /// arcs that have infinite upper bound.
     92  /// \warning This algorithm does not support negative costs for
     93  /// arcs having infinite upper bound.
    9494#ifdef DOXYGEN
    9595  template <typename GR, typename V, typename C, typename TR>
     
    424424    ///
    425425    /// Using this function has the same effect as using \ref supplyMap()
    426     /// with such a map in which \c k is assigned to \c s, \c -k is
     426    /// with a map in which \c k is assigned to \c s, \c -k is
    427427    /// assigned to \c t and all other nodes have zero supply value.
    428428    ///
  • lemon/cost_scaling.h

    r1023 r1026  
    117117  /// consider to use the named template parameters instead.
    118118  ///
    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
    120121  /// be integer.
    121122  /// \warning This algorithm does not support negative costs for
  • lemon/cost_scaling.h

    r1025 r1026  
    9898  /// "preflow push-relabel" algorithm for the maximum flow problem.
    9999  ///
     100  /// In general, \ref NetworkSimplex and \ref CostScaling are the fastest
     101  /// implementations available in LEMON for this problem.
     102  ///
    100103  /// Most of the parameters of the problem (except for the digraph)
    101104  /// can be given using separate functions, and the algorithm can be
     
    117120  /// \warning All input data (capacities, supply values, and costs) must
    118121  /// be integer.
    119   /// \warning This algorithm does not support negative costs for such
    120   /// arcs that have infinite upper bound.
     122  /// \warning This algorithm does not support negative costs for
     123  /// arcs having infinite upper bound.
    121124  ///
    122125  /// \note %CostScaling provides three different internal methods,
     
    180183    /// relabel operation.
    181184    /// By default, the so called \ref PARTIAL_AUGMENT
    182     /// "Partial Augment-Relabel" method is used, which proved to be
     185    /// "Partial Augment-Relabel" method is used, which turned out to be
    183186    /// the most efficient and the most robust on various test inputs.
    184187    /// However, the other methods can be selected using the \ref run()
     
    449452    ///
    450453    /// Using this function has the same effect as using \ref supplyMap()
    451     /// with such a map in which \c k is assigned to \c s, \c -k is
     454    /// with a map in which \c k is assigned to \c s, \c -k is
    452455    /// assigned to \c t and all other nodes have zero supply value.
    453456    ///
  • lemon/cycle_canceling.h

    r1023 r1026  
    6666  /// algorithm. By default, it is the same as \c V.
    6767  ///
    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
    6970  /// be integer.
    7071  /// \warning This algorithm does not support negative costs for
  • lemon/cycle_canceling.h

    r1025 r1026  
    6969  /// \warning All input data (capacities, supply values, and costs) must
    7070  /// be integer.
    71   /// \warning This algorithm does not support negative costs for such
    72   /// arcs that have infinite upper bound.
     71  /// \warning This algorithm does not support negative costs for
     72  /// arcs having infinite upper bound.
    7373  ///
    7474  /// \note For more information about the three available methods,
     
    118118    /// \ref CycleCanceling provides three different cycle-canceling
    119119    /// 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.
    122121    /// However, the other methods can be selected using the \ref run()
    123122    /// function with the proper parameter.
     
    351350    ///
    352351    /// Using this function has the same effect as using \ref supplyMap()
    353     /// with such a map in which \c k is assigned to \c s, \c -k is
     352    /// with a map in which \c k is assigned to \c s, \c -k is
    354353    /// assigned to \c t and all other nodes have zero supply value.
    355354    ///
  • lemon/network_simplex.h

    r1023 r1026  
    6464  /// algorithm. By default, it is the same as \c V.
    6565  ///
    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
    6768  /// be integer.
    6869  ///
  • lemon/network_simplex.h

    r1025 r1026  
    4848  /// flow problem.
    4949  ///
    50   /// In general, %NetworkSimplex is the fastest implementation available
    51   /// in LEMON for this problem.
    52   /// Moreover, it supports both directions of the supply/demand inequality
    53   /// 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.
    5454  ///
    5555  /// Most of the parameters of the problem (except for the digraph)
     
    127127    /// of the algorithm.
    128128    /// By default, \ref BLOCK_SEARCH "Block Search" is used, which
    129     /// proved to be the most efficient and the most robust on various
     129    /// turend out to be the most efficient and the most robust on various
    130130    /// test inputs.
    131131    /// However, another pivot rule can be selected using the \ref run()
     
    169169    typedef std::vector<Cost> CostVector;
    170170    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
    172172    // vector<ArcDirection> for efficiency reasons
    173173
     
    736736    ///
    737737    /// \return <tt>(*this)</tt>
     738    ///
     739    /// \sa supplyType()
    738740    template<typename SupplyMap>
    739741    NetworkSimplex& supplyMap(const SupplyMap& map) {
     
    752754    ///
    753755    /// Using this function has the same effect as using \ref supplyMap()
    754     /// with such a map in which \c k is assigned to \c s, \c -k is
     756    /// with a map in which \c k is assigned to \c s, \c -k is
    755757    /// assigned to \c t and all other nodes have zero supply value.
    756758    ///
Note: See TracChangeset for help on using the changeset viewer.