diff -r fa71d9612c42 -r 054566ac0934 lemon/min_cost_flow.h --- a/lemon/min_cost_flow.h Wed Feb 27 11:39:03 2008 +0000 +++ b/lemon/min_cost_flow.h Thu Feb 28 02:54:27 2008 +0000 @@ -43,9 +43,7 @@ /// \ref NetworkSimplex. /// /// There are four implementations for the minimum cost flow problem, - /// which can be used exactly the same way except for the fact that - /// \ref CycleCanceling does not provide dual solution (node - /// potentials) since it is a pure primal method. + /// which can be used exactly the same way. /// - \ref CapacityScaling The capacity scaling algorithm. /// - \ref CostScaling The cost scaling algorithm. /// - \ref CycleCanceling A cycle-canceling algorithm. @@ -60,20 +58,16 @@ /// \warning /// - Edge capacities and costs should be \e non-negative \e integers. /// - Supply values should be \e signed \e integers. - /// - \c LowerMap::Value must be convertible to \c CapacityMap::Value. - /// - \c CapacityMap::Value and \c SupplyMap::Value must be - /// convertible to each other. - /// - All value types must be convertible to \c CostMap::Value, which - /// must be signed type. + /// - The value types of the maps should be convertible to each other. + /// - \c CostMap::Value must be signed type. /// /// \author Peter Kovacs template < typename Graph, typename LowerMap = typename Graph::template EdgeMap, - typename CapacityMap = LowerMap, + typename CapacityMap = typename Graph::template EdgeMap, typename CostMap = typename Graph::template EdgeMap, - typename SupplyMap = typename Graph::template NodeMap - > + typename SupplyMap = typename Graph::template NodeMap > class MinCostFlow : public NetworkSimplex< Graph, LowerMap, CapacityMap, CostMap, SupplyMap > @@ -85,7 +79,7 @@ public: - /// General constructor of the class (with lower bounds). + /// General constructor (with lower bounds). MinCostFlow( const Graph &graph, const LowerMap &lower, const CapacityMap &capacity, @@ -100,7 +94,7 @@ const SupplyMap &supply ) : MinCostFlowImpl(graph, capacity, cost, supply) {} - /// Simple constructor of the class (with lower bounds). + /// Simple constructor (with lower bounds). MinCostFlow( const Graph &graph, const LowerMap &lower, const CapacityMap &capacity, @@ -110,7 +104,7 @@ MinCostFlowImpl( graph, lower, capacity, cost, s, t, flow_value ) {} - /// Simple constructor of the class (without lower bounds). + /// Simple constructor (without lower bounds). MinCostFlow( const Graph &graph, const CapacityMap &capacity, const CostMap &cost,