lemon-1.2: comparison lemon/circulation.h

equal deleted inserted replaced

-:35e38c53a9ec
+:e1b5e2985d89
 /// The type of the map that stores the signed supply values of the
 /// nodes.
 /// It must conform to the \ref concepts::ReadMap "ReadMap" concept.
 typedef SM SupplyMap;
-/// \brief The type of the flow values.
+/// \brief The type of the flow and supply values.
-typedef typename SupplyMap::Value Flow;
+typedef typename SupplyMap::Value Value;
 /// \brief The type of the map that stores the flow values.
 ///
 /// The type of the map that stores the flow values.
 /// It must conform to the \ref concepts::ReadWriteMap "ReadWriteMap"
 /// concept.
-typedef typename Digraph::template ArcMap<Flow> FlowMap;
+typedef typename Digraph::template ArcMap<Value> FlowMap;
 /// \brief Instantiates a FlowMap.
 ///
 /// This function instantiates a \ref FlowMap.
 /// \param digraph The digraph for which we would like to define
 }
 /// \brief The tolerance used by the algorithm
 ///
 /// The tolerance used by the algorithm to handle inexact computation.
-typedef lemon::Tolerance<Flow> Tolerance;
+typedef lemon::Tolerance<Value> Tolerance;
 };
 /**
 \brief Push-relabel algorithm for the network circulation problem.
 ///The \ref CirculationDefaultTraits "traits class" of the algorithm.
 typedef TR Traits;
 ///The type of the digraph the algorithm runs on.
 typedef typename Traits::Digraph Digraph;
-///The type of the flow values.
+///The type of the flow and supply values.
-typedef typename Traits::Flow Flow;
+typedef typename Traits::Value Value;
 ///The type of the lower bound map.
 typedef typename Traits::LowerMap LowerMap;
 ///The type of the upper bound (capacity) map.
 typedef typename Traits::UpperMap UpperMap;
 bool _local_flow;
 Elevator* _level;
 bool _local_level;
-typedef typename Digraph::template NodeMap<Flow> ExcessMap;
+typedef typename Digraph::template NodeMap<Value> ExcessMap;
 ExcessMap* _excess;
 Tolerance _tol;
 int _el;
 } else if (_tol.less(-(*_excess)[_g.target(e)], (*_lo)[e])) {
 _flow->set(e, (*_lo)[e]);
 (*_excess)[_g.target(e)] += (*_lo)[e];
 (*_excess)[_g.source(e)] -= (*_lo)[e];
 } else {
-Flow fc = -(*_excess)[_g.target(e)];
+Value fc = -(*_excess)[_g.target(e)];
 _flow->set(e, fc);
 (*_excess)[_g.target(e)] = 0;
 (*_excess)[_g.source(e)] -= fc;
 }
 }
 Node bact=INVALID;
 Node last_activated=INVALID;
 while((act=_level->highestActive())!=INVALID) {
 int actlevel=(*_level)[act];
 int mlevel=_node_num;
-Flow exc=(*_excess)[act];
+Value exc=(*_excess)[act];
 for(OutArcIt e(_g,act);e!=INVALID; ++e) {
 Node v = _g.target(e);
-Flow fc=(*_up)[e]-(*_flow)[e];
+Value fc=(*_up)[e]-(*_flow)[e];
 if(!_tol.positive(fc)) continue;
 if((*_level)[v]<actlevel) {
 if(!_tol.less(fc, exc)) {
 _flow->set(e, (*_flow)[e] + exc);
 (*_excess)[v] += exc;
 }
 else if((*_level)[v]<mlevel) mlevel=(*_level)[v];
 }
 for(InArcIt e(_g,act);e!=INVALID; ++e) {
 Node v = _g.source(e);
-Flow fc=(*_flow)[e]-(*_lo)[e];
+Value fc=(*_flow)[e]-(*_lo)[e];
 if(!_tol.positive(fc)) continue;
 if((*_level)[v]<actlevel) {
 if(!_tol.less(fc, exc)) {
 _flow->set(e, (*_flow)[e] - exc);
 (*_excess)[v] += exc;
 /// Either \ref run() or \ref start() should be called before
 /// using them.
 ///@{
-/// \brief Returns the flow on the given arc.
+/// \brief Returns the flow value on the given arc.
 ///
-/// Returns the flow on the given arc.
+/// Returns the flow value on the given arc.
 ///
 /// \pre Either \ref run() or \ref init() must be called before
 /// using this function.
-Flow flow(const Arc& arc) const {
+Value flow(const Arc& arc) const {
 return (*_flow)[arc];
 }
 /// \brief Returns a const reference to the flow map.
 ///
 bool checkFlow() const {
 for(ArcIt e(_g);e!=INVALID;++e)
 if((*_flow)[e]<(*_lo)[e]||(*_flow)[e]>(*_up)[e]) return false;
 for(NodeIt n(_g);n!=INVALID;++n)
 {
-Flow dif=-(*_supply)[n];
+Value dif=-(*_supply)[n];
 for(InArcIt e(_g,n);e!=INVALID;++e) dif-=(*_flow)[e];
 for(OutArcIt e(_g,n);e!=INVALID;++e) dif+=(*_flow)[e];
 if(_tol.negative(dif)) return false;
 }
 return true;
 ///Check whether or not the last execution provides a barrier.
 ///\sa barrier()
 ///\sa barrierMap()
 bool checkBarrier() const
 {
-Flow delta=0;
+Value delta=0;
-Flow inf_cap = std::numeric_limits<Flow>::has_infinity ?
+Value inf_cap = std::numeric_limits<Value>::has_infinity ?
-std::numeric_limits<Flow>::infinity() :
+std::numeric_limits<Value>::infinity() :
-std::numeric_limits<Flow>::max();
+std::numeric_limits<Value>::max();
 for(NodeIt n(_g);n!=INVALID;++n)
 if(barrier(n))
 delta-=(*_supply)[n];
 for(ArcIt e(_g);e!=INVALID;++e)
 {

changeset 647	dcba640438c7
parent 622	28f58740b6f8
child 688	1f08e846df29
child 713	4ac30454f1c1