LEMON/LEMON-main Changeset - r641:756a5ec551c8

Repositories » LEMON » LEMON-main

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r641:756a5ec551c8

« 640:6c408d

642:111698 »

r641:756a5ec551c8

Wed, 29 Apr 2009 14:25:51

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Rename Flow to Value in the flow algorithms (#266) We agreed that using Flow for the value type is misleading, since a flow should be rather a function on the arcs, not a single value. This patch reverts the changes of [dacc2cee2b4c] for Preflow and Circulation.

0 3 0

default

3 files changed with 73 insertions and 73 deletions:

lemon/circulation.h

lemon/network_simplex.h

lemon/preflow.h

↑ Collapse diff ↑

lemon/circulation.h

Show inline comments

@@ -66,4 +66,4 @@
 		    /// \brief The type of the flow values.
 		    typedef typename SupplyMap::Value Flow;
 		    /// \brief The type of the flow and supply values.
 		    typedef typename SupplyMap::Value Value;
@@ -74,3 +74,3 @@
 		    /// concept.
-		    typedef typename Digraph::template ArcMap<Flow> FlowMap;
+		    typedef typename Digraph::template ArcMap<Value> FlowMap;
@@ -106,3 +106,3 @@
 		    /// The tolerance used by the algorithm to handle inexact computation.
-		    typedef lemon::Tolerance<Flow> Tolerance;
+		    typedef lemon::Tolerance<Value> Tolerance;
@@ -189,4 +189,4 @@
 		    typedef typename Traits::Digraph Digraph;
 		    ///The type of the flow values.
 		    typedef typename Traits::Flow Flow;
 		    ///The type of the flow and supply values.
 		    typedef typename Traits::Value Value;
@@ -223,3 +223,3 @@
-		    typedef typename Digraph::template NodeMap<Flow> ExcessMap;
+		    typedef typename Digraph::template NodeMap<Value> ExcessMap;
 		    ExcessMap* _excess;
@@ -532,3 +532,3 @@
 		        } else {
-		          Flow fc = -(*_excess)[_g.target(e)];
+		          Value fc = -(*_excess)[_g.target(e)];
 		          _flow->set(e, fc);
@@ -565,3 +565,3 @@
 		        int mlevel=_node_num;
-		        Flow exc=(*_excess)[act];
+		        Value exc=(*_excess)[act];
@@ -569,3 +569,3 @@
 		          Node v = _g.target(e);
-		          Flow fc=(*_up)[e]-(*_flow)[e];
+		          Value fc=(*_up)[e]-(*_flow)[e];
 		          if(!_tol.positive(fc)) continue;
@@ -593,3 +593,3 @@
 		          Node v = _g.source(e);
-		          Flow fc=(*_flow)[e]-(*_lo)[e];
+		          Value fc=(*_flow)[e]-(*_lo)[e];
 		          if(!_tol.positive(fc)) continue;
@@ -663,5 +663,5 @@
 		    /// \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.
 		    ///
@@ -669,3 +669,3 @@
 		    /// using this function.
-		    Flow flow(const Arc& arc) const {
+		    Value flow(const Arc& arc) const {
 		      return (*_flow)[arc];
@@ -752,3 +752,3 @@
+		        {
-		          Flow dif=-(*_supply)[n];
+		          Value dif=-(*_supply)[n];
 		          for(InArcIt e(_g,n);e!=INVALID;++e) dif-=(*_flow)[e];
@@ -767,6 +767,6 @@
+		    {
 		      Flow delta=0;
 		      Flow inf_cap = std::numeric_limits<Flow>::has_infinity ?
 		        std::numeric_limits<Flow>::infinity() :
 		        std::numeric_limits<Flow>::max();
 		      Value delta=0;
 		      Value inf_cap = std::numeric_limits<Value>::has_infinity ?
 		        std::numeric_limits<Value>::infinity() :
 		        std::numeric_limits<Value>::max();
 		      for(NodeIt n(_g);n!=INVALID;++n)

lemon/network_simplex.h

Show inline comments

@@ -58,6 +58,6 @@
 		  /// \tparam GR The digraph type the algorithm runs on.
-		  /// \tparam F The value type used for flow amounts, capacity bounds
+		  /// \tparam V The value type used for flow amounts, capacity bounds
 		  /// and supply values in the algorithm. By default it is \c int.
 		  /// \tparam C The value type used for costs and potentials in the
-		  /// algorithm. By default it is the same as \c F.
+		  /// algorithm. By default it is the same as \c V.
 		  ///
@@ -69,3 +69,3 @@
 		  /// by default. For more information see \ref PivotRule.
-		  template <typename GR, typename F = int, typename C = F>
+		  template <typename GR, typename V = int, typename C = V>
 		  class NetworkSimplex
@@ -75,3 +75,3 @@
 		    /// The flow type of the algorithm
-		    typedef F Flow;
+		    typedef V Value;
 		    /// The cost type of the algorithm
@@ -80,3 +80,3 @@
 		    /// The type of the flow map
-		    typedef GR::ArcMap<Flow> FlowMap;
+		    typedef GR::ArcMap<Value> FlowMap;
 		    /// The type of the potential map
@@ -85,3 +85,3 @@
 		    /// The type of the flow map
-		    typedef typename GR::template ArcMap<Flow> FlowMap;
+		    typedef typename GR::template ArcMap<Value> FlowMap;
 		    /// The type of the potential map
@@ -208,5 +208,5 @@
-		    typedef typename GR::template ArcMap<Flow> FlowArcMap;
+		    typedef typename GR::template ArcMap<Value> ValueArcMap;
 		    typedef typename GR::template ArcMap<Cost> CostArcMap;
-		    typedef typename GR::template NodeMap<Flow> FlowNodeMap;
+		    typedef typename GR::template NodeMap<Value> ValueNodeMap;
@@ -216,3 +216,3 @@
 		    typedef std::vector<bool> BoolVector;
-		    typedef std::vector<Flow> FlowVector;
+		    typedef std::vector<Value> FlowVector;
 		    typedef std::vector<Cost> CostVector;
@@ -234,12 +234,12 @@
 		    // Parameters of the problem
 		    FlowArcMap *_plower;
 		    FlowArcMap *_pupper;
 		    ValueArcMap *_plower;
 		    ValueArcMap *_pupper;
 		    CostArcMap *_pcost;
-		    FlowNodeMap *_psupply;
+		    ValueNodeMap *_psupply;
 		    bool _pstsup;
 		    Node _psource, _ptarget;
-		    Flow _pstflow;
+		    Value _pstflow;
 		    SupplyType _stype;
-		    Flow _sum_supply;
+		    Value _sum_supply;
@@ -280,3 +280,3 @@
 		    int stem, par_stem, new_stem;
-		    Flow delta;
+		    Value delta;
@@ -287,5 +287,5 @@
 		    /// Constant for infinite upper bounds (capacities).
 		    /// It is \c std::numeric_limits<Flow>::infinity() if available,
 		    /// \c std::numeric_limits<Flow>::max() otherwise.
-		    const Flow INF;
+		    /// It is \c std::numeric_limits<Value>::infinity() if available,
 		    /// \c std::numeric_limits<Value>::max() otherwise.
 		    const Value INF;
@@ -697,8 +697,8 @@
 		      _node_id(graph),
 		      INF(std::numeric_limits<Flow>::has_infinity ?
 		          std::numeric_limits<Flow>::infinity() :
-		          std::numeric_limits<Flow>::max())
+		      INF(std::numeric_limits<Value>::has_infinity ?
 		          std::numeric_limits<Value>::infinity() :
 		          std::numeric_limits<Value>::max())
+		    {
 		      // Check the value types
-		      LEMON_ASSERT(std::numeric_limits<Flow>::is_signed,
+		      LEMON_ASSERT(std::numeric_limits<Value>::is_signed,
 		        "The flow type of NetworkSimplex must be signed");
@@ -727,3 +727,3 @@
 		    /// \param map An arc map storing the lower bounds.
-		    /// Its \c Value type must be convertible to the \c Flow type
+		    /// Its \c Value type must be convertible to the \c Value type
 		    /// of the algorithm.
@@ -734,3 +734,3 @@
 		      delete _plower;
-		      _plower = new FlowArcMap(_graph);
+		      _plower = new ValueArcMap(_graph);
 		      for (ArcIt a(_graph); a != INVALID; ++a) {
@@ -749,3 +749,3 @@
 		    /// \param map An arc map storing the upper bounds.
-		    /// Its \c Value type must be convertible to the \c Flow type
+		    /// Its \c Value type must be convertible to the \c Value type
 		    /// of the algorithm.
@@ -756,3 +756,3 @@
 		      delete _pupper;
-		      _pupper = new FlowArcMap(_graph);
+		      _pupper = new ValueArcMap(_graph);
 		      for (ArcIt a(_graph); a != INVALID; ++a) {
@@ -792,3 +792,3 @@
 		    /// \param map A node map storing the supply values.
-		    /// Its \c Value type must be convertible to the \c Flow type
+		    /// Its \c Value type must be convertible to the \c Value type
 		    /// of the algorithm.
@@ -800,3 +800,3 @@
 		      _pstsup = false;
-		      _psupply = new FlowNodeMap(_graph);
+		      _psupply = new ValueNodeMap(_graph);
 		      for (NodeIt n(_graph); n != INVALID; ++n) {
@@ -825,3 +825,3 @@
 		    /// \return <tt>(*this)</tt>
-		    NetworkSimplex& stSupply(const Node& s, const Node& t, Flow k) {
+		    NetworkSimplex& stSupply(const Node& s, const Node& t, Value k) {
 		      delete _psupply;
@@ -1027,3 +1027,3 @@
 		    /// \pre \ref run() must be called before using this function.
-		    Flow flow(const Arc& a) const {
+		    Value flow(const Arc& a) const {
 		      return (*_flow_map)[a];
@@ -1206,3 +1206,3 @@
 		        for (int i = 0; i != _arc_num; ++i) {
-		          Flow c = (*_plower)[_arc_ref[i]];
+		          Value c = (*_plower)[_arc_ref[i]];
 		          if (c > 0) {
@@ -1277,3 +1277,3 @@
 		      int result = 0;
-		      Flow d;
+		      Value d;
 		      int e;
@@ -1317,3 +1317,3 @@
 		      if (delta > 0) {
-		        Flow val = _state[in_arc] * delta;
+		        Value val = _state[in_arc] * delta;
 		        _flow[in_arc] += val;

lemon/preflow.h

Show inline comments

@@ -48,3 +48,3 @@
 		    /// \brief The type of the flow values.
-		    typedef typename CapacityMap::Value Flow;
+		    typedef typename CapacityMap::Value Value;
@@ -54,3 +54,3 @@
 		    /// It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept.
-		    typedef typename Digraph::template ArcMap<Flow> FlowMap;
+		    typedef typename Digraph::template ArcMap<Value> FlowMap;
@@ -86,3 +86,3 @@
 		    /// The tolerance used by the algorithm to handle inexact computation.
-		    typedef lemon::Tolerance<Flow> Tolerance;
+		    typedef lemon::Tolerance<Value> Tolerance;
@@ -127,3 +127,3 @@
 		    ///The type of the flow values.
-		    typedef typename Traits::Flow Flow;
+		    typedef typename Traits::Value Value;
@@ -153,3 +153,3 @@
-		    typedef typename Digraph::template NodeMap<Flow> ExcessMap;
+		    typedef typename Digraph::template NodeMap<Value> ExcessMap;
 		    ExcessMap* _excess;
@@ -472,3 +472,3 @@
 		      for (NodeIt n(_graph); n != INVALID; ++n) {
-		        Flow excess = 0;
+		        Value excess = 0;
 		        for (InArcIt e(_graph, n); e != INVALID; ++e) {
@@ -521,3 +521,3 @@
 		      for (OutArcIt e(_graph, _source); e != INVALID; ++e) {
-		        Flow rem = (*_capacity)[e] - (*_flow)[e];
+		        Value rem = (*_capacity)[e] - (*_flow)[e];
 		        if (_tolerance.positive(rem)) {
@@ -533,3 +533,3 @@
 		      for (InArcIt e(_graph, _source); e != INVALID; ++e) {
-		        Flow rem = (*_flow)[e];
+		        Value rem = (*_flow)[e];
 		        if (_tolerance.positive(rem)) {
@@ -566,3 +566,3 @@
 		        while (num > 0 && n != INVALID) {
-		          Flow excess = (*_excess)[n];
+		          Value excess = (*_excess)[n];
 		          int new_level = _level->maxLevel();
@@ -570,3 +570,3 @@
 		          for (OutArcIt e(_graph, n); e != INVALID; ++e) {
-		            Flow rem = (*_capacity)[e] - (*_flow)[e];
+		            Value rem = (*_capacity)[e] - (*_flow)[e];
 		            if (!_tolerance.positive(rem)) continue;
@@ -593,3 +593,3 @@
 		          for (InArcIt e(_graph, n); e != INVALID; ++e) {
-		            Flow rem = (*_flow)[e];
+		            Value rem = (*_flow)[e];
 		            if (!_tolerance.positive(rem)) continue;
@@ -639,3 +639,3 @@
 		        while (num > 0 && n != INVALID) {
-		          Flow excess = (*_excess)[n];
+		          Value excess = (*_excess)[n];
 		          int new_level = _level->maxLevel();
@@ -643,3 +643,3 @@
 		          for (OutArcIt e(_graph, n); e != INVALID; ++e) {
-		            Flow rem = (*_capacity)[e] - (*_flow)[e];
+		            Value rem = (*_capacity)[e] - (*_flow)[e];
 		            if (!_tolerance.positive(rem)) continue;
@@ -666,3 +666,3 @@
 		          for (InArcIt e(_graph, n); e != INVALID; ++e) {
-		            Flow rem = (*_flow)[e];
+		            Value rem = (*_flow)[e];
 		            if (!_tolerance.positive(rem)) continue;
@@ -780,3 +780,3 @@
 		      while ((n = _level->highestActive()) != INVALID) {
-		        Flow excess = (*_excess)[n];
+		        Value excess = (*_excess)[n];
 		        int level = _level->highestActiveLevel();
@@ -785,3 +785,3 @@
 		        for (OutArcIt e(_graph, n); e != INVALID; ++e) {
-		          Flow rem = (*_capacity)[e] - (*_flow)[e];
+		          Value rem = (*_capacity)[e] - (*_flow)[e];
 		          if (!_tolerance.positive(rem)) continue;
@@ -808,3 +808,3 @@
 		        for (InArcIt e(_graph, n); e != INVALID; ++e) {
-		          Flow rem = (*_flow)[e];
+		          Value rem = (*_flow)[e];
 		          if (!_tolerance.positive(rem)) continue;
@@ -899,3 +899,3 @@
 		    /// using this function.
-		    Flow flowValue() const {
+		    Value flowValue() const {
 		      return (*_excess)[_target];
@@ -903,5 +903,5 @@
 		    /// \brief Returns the flow on the given arc.
+		    /// \brief Returns the flow value on the given arc.
 		    ///
 		    /// Returns the flow on the given arc. This method can
+		    /// Returns the flow value on the given arc. This method can
 		    /// be called after the second phase of the algorithm.
@@ -910,3 +910,3 @@
 		    /// using this function.
-		    Flow flow(const Arc& arc) const {
+		    Value flow(const Arc& arc) const {
 		      return (*_flow)[arc];

0 comments (0 inline)

RhodeCode

Login to your account