COIN-OR::LEMON - Graph Library

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • 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.