lemon-1.3: comparison lemon/karp

equal deleted inserted replaced

-:79d9de9c39b4
+:9de9f6214db8
 * express or implied, and with no claim as to its suitability for any
 * purpose.
 *
 */
-#ifndef LEMON_KARP_H
+#ifndef LEMON_KARP_MMC_H
-#define LEMON_KARP_H
+#define LEMON_KARP_MMC_H
 /// \ingroup min_mean_cycle
 ///
 /// \file
 /// \brief Karp's algorithm for finding a minimum mean cycle.
 #include <lemon/tolerance.h>
 #include <lemon/connectivity.h>
 namespace lemon {
-/// \brief Default traits class of Karp algorithm.
+/// \brief Default traits class of KarpMmc class.
 ///
-/// Default traits class of Karp algorithm.
+/// Default traits class of KarpMmc class.
 /// \tparam GR The type of the digraph.
-/// \tparam LEN The type of the length map.
+/// \tparam CM The type of the cost map.
 /// It must conform to the \ref concepts::ReadMap "ReadMap" concept.
 #ifdef DOXYGEN
-template <typename GR, typename LEN>
+template <typename GR, typename CM>
 #else
-template <typename GR, typename LEN,
+template <typename GR, typename CM,
-bool integer = std::numeric_limits<typename LEN::Value>::is_integer>
+bool integer = std::numeric_limits<typename CM::Value>::is_integer>
 #endif
-struct KarpDefaultTraits
+struct KarpMmcDefaultTraits
 {
 /// The type of the digraph
 typedef GR Digraph;
-/// The type of the length map
+/// The type of the cost map
-typedef LEN LengthMap;
+typedef CM CostMap;
-/// The type of the arc lengths
+/// The type of the arc costs
-typedef typename LengthMap::Value Value;
+typedef typename CostMap::Value Cost;
-/// \brief The large value type used for internal computations
+/// \brief The large cost type used for internal computations
 ///
-/// The large value type used for internal computations.
+/// The large cost type used for internal computations.
-/// It is \c long \c long if the \c Value type is integer,
+/// It is \c long \c long if the \c Cost type is integer,
 /// otherwise it is \c double.
-/// \c Value must be convertible to \c LargeValue.
+/// \c Cost must be convertible to \c LargeCost.
-typedef double LargeValue;
+typedef double LargeCost;
 /// The tolerance type used for internal computations
-typedef lemon::Tolerance<LargeValue> Tolerance;
+typedef lemon::Tolerance<LargeCost> Tolerance;
 /// \brief The path type of the found cycles
 ///
 /// The path type of the found cycles.
 /// It must conform to the \ref lemon::concepts::Path "Path" concept
 /// and it must have an \c addFront() function.
 typedef lemon::Path<Digraph> Path;
 };
-// Default traits class for integer value types
+// Default traits class for integer cost types
-template <typename GR, typename LEN>
+template <typename GR, typename CM>
-struct KarpDefaultTraits<GR, LEN, true>
+struct KarpMmcDefaultTraits<GR, CM, true>
 {
 typedef GR Digraph;
-typedef LEN LengthMap;
+typedef CM CostMap;
-typedef typename LengthMap::Value Value;
+typedef typename CostMap::Value Cost;
 #ifdef LEMON_HAVE_LONG_LONG
-typedef long long LargeValue;
+typedef long long LargeCost;
 #else
-typedef long LargeValue;
+typedef long LargeCost;
 #endif
-typedef lemon::Tolerance<LargeValue> Tolerance;
+typedef lemon::Tolerance<LargeCost> Tolerance;
 typedef lemon::Path<Digraph> Path;
 };
 /// \addtogroup min_mean_cycle
 /// \brief Implementation of Karp's algorithm for finding a minimum
 /// mean cycle.
 ///
 /// This class implements Karp's algorithm for finding a directed
-/// cycle of minimum mean length (cost) in a digraph
+/// cycle of minimum mean cost in a digraph
 /// \ref amo93networkflows, \ref dasdan98minmeancycle.
 /// It runs in time O(ne) and uses space O(n<sup>2</sup>+e).
 ///
 /// \tparam GR The type of the digraph the algorithm runs on.
-/// \tparam LEN The type of the length map. The default
+/// \tparam CM The type of the cost map. The default
 /// map type is \ref concepts::Digraph::ArcMap "GR::ArcMap<int>".
 /// \tparam TR The traits class that defines various types used by the
-/// algorithm. By default, it is \ref KarpDefaultTraits
+/// algorithm. By default, it is \ref KarpMmcDefaultTraits
-/// "KarpDefaultTraits<GR, LEN>".
+/// "KarpMmcDefaultTraits<GR, CM>".
 /// In most cases, this parameter should not be set directly,
 /// consider to use the named template parameters instead.
 #ifdef DOXYGEN
-template <typename GR, typename LEN, typename TR>
+template <typename GR, typename CM, typename TR>
 #else
 template < typename GR,
-typename LEN = typename GR::template ArcMap<int>,
+typename CM = typename GR::template ArcMap<int>,
-typename TR = KarpDefaultTraits<GR, LEN> >
+typename TR = KarpMmcDefaultTraits<GR, CM> >
 #endif
-class Karp
+class KarpMmc
 {
 public:
 /// The type of the digraph
 typedef typename TR::Digraph Digraph;
-/// The type of the length map
+/// The type of the cost map
-typedef typename TR::LengthMap LengthMap;
+typedef typename TR::CostMap CostMap;
-/// The type of the arc lengths
+/// The type of the arc costs
-typedef typename TR::Value Value;
+typedef typename TR::Cost Cost;
-/// \brief The large value type
+/// \brief The large cost type
 ///
-/// The large value type used for internal computations.
+/// The large cost type used for internal computations.
-/// By default, it is \c long \c long if the \c Value type is integer,
+/// By default, it is \c long \c long if the \c Cost type is integer,
 /// otherwise it is \c double.
-typedef typename TR::LargeValue LargeValue;
+typedef typename TR::LargeCost LargeCost;
 /// The tolerance type
 typedef typename TR::Tolerance Tolerance;
 /// \brief The path type of the found cycles
 ///
 /// The path type of the found cycles.
-/// Using the \ref KarpDefaultTraits "default traits class",
+/// Using the \ref KarpMmcDefaultTraits "default traits class",
 /// it is \ref lemon::Path "Path<Digraph>".
 typedef typename TR::Path Path;
-/// The \ref KarpDefaultTraits "traits class" of the algorithm
+/// The \ref KarpMmcDefaultTraits "traits class" of the algorithm
 typedef TR Traits;
 private:
 TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
 // Data sturcture for path data
 struct PathData
 {
-LargeValue dist;
+LargeCost dist;
 Arc pred;
-PathData(LargeValue d, Arc p = INVALID) :
+PathData(LargeCost d, Arc p = INVALID) :
 dist(d), pred(p) {}
 };
 typedef typename Digraph::template NodeMap<std::vector<PathData> >
 PathDataNodeMap;
 private:
 // The digraph the algorithm runs on
 const Digraph &_gr;
-// The length of the arcs
+// The cost of the arcs
-const LengthMap &_length;
+const CostMap &_cost;
 // Data for storing the strongly connected components
 int _comp_num;
 typename Digraph::template NodeMap<int> _comp;
 std::vector<std::vector<Node> > _comp_nodes;
 std::vector<Node>* _nodes;
 typename Digraph::template NodeMap<std::vector<Arc> > _out_arcs;
 // Data for the found cycle
-LargeValue _cycle_length;
+LargeCost _cycle_cost;
 int _cycle_size;
 Node _cycle_node;
 Path *_cycle_path;
 bool _local_path;
 std::vector<Node> _process;
 Tolerance _tolerance;
 // Infinite constant
-const LargeValue INF;
+const LargeCost INF;
 public:
 /// \name Named Template Parameters
 /// @{
 template <typename T>
-struct SetLargeValueTraits : public Traits {
+struct SetLargeCostTraits : public Traits {
-typedef T LargeValue;
+typedef T LargeCost;
 typedef lemon::Tolerance<T> Tolerance;
 };
 /// \brief \ref named-templ-param "Named parameter" for setting
-/// \c LargeValue type.
+/// \c LargeCost type.
 ///
-/// \ref named-templ-param "Named parameter" for setting \c LargeValue
+/// \ref named-templ-param "Named parameter" for setting \c LargeCost
 /// type. It is used for internal computations in the algorithm.
 template <typename T>
-struct SetLargeValue
+struct SetLargeCost
-: public Karp<GR, LEN, SetLargeValueTraits<T> > {
+: public KarpMmc<GR, CM, SetLargeCostTraits<T> > {
-typedef Karp<GR, LEN, SetLargeValueTraits<T> > Create;
+typedef KarpMmc<GR, CM, SetLargeCostTraits<T> > Create;
 };
 template <typename T>
 struct SetPathTraits : public Traits {
 typedef T Path;
 /// type of the found cycles.
 /// It must conform to the \ref lemon::concepts::Path "Path" concept
 /// and it must have an \c addFront() function.
 template <typename T>
 struct SetPath
-: public Karp<GR, LEN, SetPathTraits<T> > {
+: public KarpMmc<GR, CM, SetPathTraits<T> > {
-typedef Karp<GR, LEN, SetPathTraits<T> > Create;
+typedef KarpMmc<GR, CM, SetPathTraits<T> > Create;
 };
 /// @}
 protected:
-Karp() {}
+KarpMmc() {}
 public:
 /// \brief Constructor.
 ///
 /// The constructor of the class.
 ///
 /// \param digraph The digraph the algorithm runs on.
-/// \param length The lengths (costs) of the arcs.
+/// \param cost The costs of the arcs.
-Karp( const Digraph &digraph,
+KarpMmc( const Digraph &digraph,
-const LengthMap &length ) :
+const CostMap &cost ) :
-_gr(digraph), _length(length), _comp(digraph), _out_arcs(digraph),
+_gr(digraph), _cost(cost), _comp(digraph), _out_arcs(digraph),
-_cycle_length(0), _cycle_size(1), _cycle_node(INVALID),
+_cycle_cost(0), _cycle_size(1), _cycle_node(INVALID),
 _cycle_path(NULL), _local_path(false), _data(digraph),
-INF(std::numeric_limits<LargeValue>::has_infinity ?
+INF(std::numeric_limits<LargeCost>::has_infinity ?
-std::numeric_limits<LargeValue>::infinity() :
+std::numeric_limits<LargeCost>::infinity() :
-std::numeric_limits<LargeValue>::max())
+std::numeric_limits<LargeCost>::max())
 {}
 /// Destructor.
-~Karp() {
+~KarpMmc() {
 if (_local_path) delete _cycle_path;
 }
 /// \brief Set the path structure for storing the found cycle.
 ///
 /// This function sets an external path structure for storing the
 /// found cycle.
 ///
 /// If you don't call this function before calling \ref run() or
-/// \ref findMinMean(), it will allocate a local \ref Path "path"
+/// \ref findCycleMean(), it will allocate a local \ref Path "path"
 /// structure. The destuctor deallocates this automatically
 /// allocated object, of course.
 ///
 /// \note The algorithm calls only the \ref lemon::Path::addFront()
 /// "addFront()" function of the given path structure.
 ///
 /// \return <tt>(*this)</tt>
-Karp& cycle(Path &path) {
+KarpMmc& cycle(Path &path) {
 if (_local_path) {
 delete _cycle_path;
 _local_path = false;
 }
 _cycle_path = &path;
 /// \brief Set the tolerance used by the algorithm.
 ///
 /// This function sets the tolerance object used by the algorithm.
 ///
 /// \return <tt>(*this)</tt>
-Karp& tolerance(const Tolerance& tolerance) {
+KarpMmc& tolerance(const Tolerance& tolerance) {
 _tolerance = tolerance;
 return *this;
 }
 /// \brief Return a const reference to the tolerance.
 }
 /// \name Execution control
 /// The simplest way to execute the algorithm is to call the \ref run()
 /// function.\n
-/// If you only need the minimum mean length, you may call
+/// If you only need the minimum mean cost, you may call
-/// \ref findMinMean().
+/// \ref findCycleMean().
 /// @{
 /// \brief Run the algorithm.
 ///
 /// This function runs the algorithm.
 /// It can be called more than once (e.g. if the underlying digraph
-/// and/or the arc lengths have been modified).
+/// and/or the arc costs have been modified).
 ///
 /// \return \c true if a directed cycle exists in the digraph.
 ///
 /// \note <tt>mmc.run()</tt> is just a shortcut of the following code.
 /// \code
-///   return mmc.findMinMean() && mmc.findCycle();
+///   return mmc.findCycleMean() && mmc.findCycle();
 /// \endcode
 bool run() {
-return findMinMean() && findCycle();
+return findCycleMean() && findCycle();
 }
 /// \brief Find the minimum cycle mean.
 ///
-/// This function finds the minimum mean length of the directed
+/// This function finds the minimum mean cost of the directed
 /// cycles in the digraph.
 ///
 /// \return \c true if a directed cycle exists in the digraph.
-bool findMinMean() {
+bool findCycleMean() {
 // Initialization and find strongly connected components
 init();
 findComponents();
 // Find the minimum cycle mean in the components
 return (_cycle_node != INVALID);
 }
 /// \brief Find a minimum mean directed cycle.
 ///
-/// This function finds a directed cycle of minimum mean length
+/// This function finds a directed cycle of minimum mean cost
-/// in the digraph using the data computed by findMinMean().
+/// in the digraph using the data computed by findCycleMean().
 ///
 /// \return \c true if a directed cycle exists in the digraph.
 ///
-/// \pre \ref findMinMean() must be called before using this function.
+/// \pre \ref findCycleMean() must be called before using this function.
 bool findCycle() {
 if (_cycle_node == INVALID) return false;
 IntNodeMap reached(_gr, -1);
 int r = _data[_cycle_node].size();
 Node u = _cycle_node;
 u = _gr.source(_data[u][r].pred);
 }
 r = reached[u];
 Arc e = _data[u][r].pred;
 _cycle_path->addFront(e);
-_cycle_length = _length[e];
+_cycle_cost = _cost[e];
 _cycle_size = 1;
 Node v;
 while ((v = _gr.source(e)) != u) {
 e = _data[v][--r].pred;
 _cycle_path->addFront(e);
-_cycle_length += _length[e];
+_cycle_cost += _cost[e];
 ++_cycle_size;
 }
 return true;
 }
 /// functions.\n
 /// The algorithm should be executed before using them.
 /// @{
-/// \brief Return the total length of the found cycle.
+/// \brief Return the total cost of the found cycle.
 ///
-/// This function returns the total length of the found cycle.
+/// This function returns the total cost of the found cycle.
 ///
-/// \pre \ref run() or \ref findMinMean() must be called before
+/// \pre \ref run() or \ref findCycleMean() must be called before
 /// using this function.
-Value cycleLength() const {
+Cost cycleCost() const {
-return static_cast<Value>(_cycle_length);
+return static_cast<Cost>(_cycle_cost);
 }
 /// \brief Return the number of arcs on the found cycle.
 ///
 /// This function returns the number of arcs on the found cycle.
 ///
-/// \pre \ref run() or \ref findMinMean() must be called before
+/// \pre \ref run() or \ref findCycleMean() must be called before
 /// using this function.
-int cycleArcNum() const {
+int cycleSize() const {
 return _cycle_size;
 }
-/// \brief Return the mean length of the found cycle.
+/// \brief Return the mean cost of the found cycle.
 ///
-/// This function returns the mean length of the found cycle.
+/// This function returns the mean cost of the found cycle.
 ///
 /// \note <tt>alg.cycleMean()</tt> is just a shortcut of the
 /// following code.
 /// \code
-///   return static_cast<double>(alg.cycleLength()) / alg.cycleArcNum();
+///   return static_cast<double>(alg.cycleCost()) / alg.cycleSize();
 /// \endcode
 ///
-/// \pre \ref run() or \ref findMinMean() must be called before
+/// \pre \ref run() or \ref findCycleMean() must be called before
 /// using this function.
 double cycleMean() const {
-return static_cast<double>(_cycle_length) / _cycle_size;
+return static_cast<double>(_cycle_cost) / _cycle_size;
 }
 /// \brief Return the found cycle.
 ///
 /// This function returns a const reference to the path structure
 if (!_cycle_path) {
 _local_path = true;
 _cycle_path = new Path;
 }
 _cycle_path->clear();
-_cycle_length = 0;
+_cycle_cost = 0;
 _cycle_size = 1;
 _cycle_node = INVALID;
 for (NodeIt u(_gr); u != INVALID; ++u)
 _data[u].clear();
 }
 }
 return true;
 }
 // Process all rounds of computing path data for the current component.
-// _data[v][k] is the length of a shortest directed walk from the root
+// _data[v][k] is the cost of a shortest directed walk from the root
 // node to node v containing exactly k arcs.
 void processRounds() {
 Node start = (*_nodes)[0];
 _data[start][0] = PathData(0);
 _process.clear();
 // Process one round and rebuild _process
 void processNextBuildRound(int k) {
 std::vector<Node> next;
 Node u, v;
 Arc e;
-LargeValue d;
+LargeCost d;
 for (int i = 0; i < int(_process.size()); ++i) {
 u = _process[i];
 for (int j = 0; j < int(_out_arcs[u].size()); ++j) {
 e = _out_arcs[u][j];
 v = _gr.target(e);
-d = _data[u][k-1].dist + _length[e];
+d = _data[u][k-1].dist + _cost[e];
 if (_tolerance.less(d, _data[v][k].dist)) {
 if (_data[v][k].dist == INF) next.push_back(v);
 _data[v][k] = PathData(d, e);
 }
 }
 // Process one round using _nodes instead of _process
 void processNextFullRound(int k) {
 Node u, v;
 Arc e;
-LargeValue d;
+LargeCost d;
 for (int i = 0; i < int(_nodes->size()); ++i) {
 u = (*_nodes)[i];
 for (int j = 0; j < int(_out_arcs[u].size()); ++j) {
 e = _out_arcs[u][j];
 v = _gr.target(e);
-d = _data[u][k-1].dist + _length[e];
+d = _data[u][k-1].dist + _cost[e];
 if (_tolerance.less(d, _data[v][k].dist)) {
 _data[v][k] = PathData(d, e);
 }
 }
 }
 void updateMinMean() {
 int n = _nodes->size();
 for (int i = 0; i < n; ++i) {
 Node u = (*_nodes)[i];
 if (_data[u][n].dist == INF) continue;
-LargeValue length, max_length = 0;
+LargeCost cost, max_cost = 0;
 int size, max_size = 1;
 bool found_curr = false;
 for (int k = 0; k < n; ++k) {
 if (_data[u][k].dist == INF) continue;
-length = _data[u][n].dist - _data[u][k].dist;
+cost = _data[u][n].dist - _data[u][k].dist;
 size = n - k;
-if (!found_curr || length * max_size > max_length * size) {
+if (!found_curr || cost * max_size > max_cost * size) {
 found_curr = true;
-max_length = length;
+max_cost = cost;
 max_size = size;
 }
 }
 if ( found_curr && (_cycle_node == INVALID ||
-max_length * _cycle_size < _cycle_length * max_size) ) {
+max_cost * _cycle_size < _cycle_cost * max_size) ) {
-_cycle_length = max_length;
+_cycle_cost = max_cost;
 _cycle_size = max_size;
 _cycle_node = u;
 }
 }
 }
-}; //class Karp
+}; //class KarpMmc
 ///@}
 } //namespace lemon
-#endif //LEMON_KARP_H
+#endif //LEMON_KARP_MMC_H

changeset 866	2d9c6566a604
parent 863	a93f1a27d831
child 877	141f9c0db4a3