[Lemon-commits] Peter Kovacs: Use m instead of e for denoting th...
Lemon HG
hg at lemon.cs.elte.hu
Tue Aug 6 18:04:54 CEST 2013
details: http://lemon.cs.elte.hu/hg/lemon/rev/c5cd8960df74
changeset: 1254:c5cd8960df74
user: Peter Kovacs <kpeter [at] inf.elte.hu>
date: Tue Aug 06 05:38:49 2013 +0200
description:
Use m instead of e for denoting the number of arcs/edges (#463)
diffstat:
doc/groups.dox | 2 +-
lemon/bellman_ford.h | 2 +-
lemon/capacity_scaling.h | 4 ++--
lemon/cost_scaling.h | 4 ++--
lemon/cycle_canceling.h | 8 ++++----
lemon/gomory_hu.h | 2 +-
lemon/hartmann_orlin_mmc.h | 2 +-
lemon/karp_mmc.h | 2 +-
lemon/min_cost_arborescence.h | 2 +-
lemon/network_simplex.h | 2 +-
lemon/preflow.h | 2 +-
lemon/suurballe.h | 2 +-
12 files changed, 17 insertions(+), 17 deletions(-)
diffs (187 lines):
diff --git a/doc/groups.dox b/doc/groups.dox
--- a/doc/groups.dox
+++ b/doc/groups.dox
@@ -497,7 +497,7 @@
most efficient one, though the best known theoretical bound on its running
time is exponential.
Both \ref KarpMmc "Karp" and \ref HartmannOrlinMmc "Hartmann-Orlin" algorithms
-run in time O(ne) and use space O(n<sup>2</sup>+e).
+run in time O(nm) and use space O(n<sup>2</sup>+m).
*/
/**
diff --git a/lemon/bellman_ford.h b/lemon/bellman_ford.h
--- a/lemon/bellman_ford.h
+++ b/lemon/bellman_ford.h
@@ -149,7 +149,7 @@
/// \ingroup shortest_path
/// This class provides an efficient implementation of the Bellman-Ford
/// algorithm. The maximum time complexity of the algorithm is
- /// <tt>O(ne)</tt>.
+ /// <tt>O(nm)</tt>.
///
/// The Bellman-Ford algorithm solves the single-source shortest path
/// problem when the arcs can have negative lengths, but the digraph
diff --git a/lemon/capacity_scaling.h b/lemon/capacity_scaling.h
--- a/lemon/capacity_scaling.h
+++ b/lemon/capacity_scaling.h
@@ -69,7 +69,7 @@
/// \ref min_cost_flow "minimum cost flow" \cite amo93networkflows,
/// \cite edmondskarp72theoretical. It is an efficient dual
/// solution method, which runs in polynomial time
- /// \f$O(e\log U (n+e)\log n)\f$, where <i>U</i> denotes the maximum
+ /// \f$O(m\log U (n+m)\log n)\f$, where <i>U</i> denotes the maximum
/// of node supply and arc capacity values.
///
/// This algorithm is typically slower than \ref CostScaling and
@@ -646,7 +646,7 @@
/// \brief Return the total cost of the found flow.
///
/// This function returns the total cost of the found flow.
- /// Its complexity is O(e).
+ /// Its complexity is O(m).
///
/// \note The return type of the function can be specified as a
/// template parameter. For example,
diff --git a/lemon/cost_scaling.h b/lemon/cost_scaling.h
--- a/lemon/cost_scaling.h
+++ b/lemon/cost_scaling.h
@@ -97,7 +97,7 @@
/// can be viewed as the generalization of the \ref Preflow
/// "preflow push-relabel" algorithm for the maximum flow problem.
/// It is a polynomial algorithm, its running time complexity is
- /// \f$O(n^2e\log(nK))\f$, where <i>K</i> denotes the maximum arc cost.
+ /// \f$O(n^2m\log(nK))\f$, where <i>K</i> denotes the maximum arc cost.
///
/// In general, \ref NetworkSimplex and \ref CostScaling are the fastest
/// implementations available in LEMON for solving this problem.
@@ -670,7 +670,7 @@
/// \brief Return the total cost of the found flow.
///
/// This function returns the total cost of the found flow.
- /// Its complexity is O(e).
+ /// Its complexity is O(m).
///
/// \note The return type of the function can be specified as a
/// template parameter. For example,
diff --git a/lemon/cycle_canceling.h b/lemon/cycle_canceling.h
--- a/lemon/cycle_canceling.h
+++ b/lemon/cycle_canceling.h
@@ -51,7 +51,7 @@
/// \cite goldberg89cyclecanceling.
/// The most efficent one is the \ref CANCEL_AND_TIGHTEN
/// "Cancel-and-Tighten" algorithm, thus it is the default method.
- /// It runs in strongly polynomial time O(n<sup>2</sup>e<sup>2</sup>log(n)),
+ /// It runs in strongly polynomial time O(n<sup>2</sup>m<sup>2</sup>log(n)),
/// but in practice, it is typically orders of magnitude slower than
/// the scaling algorithms and \ref NetworkSimplex.
/// (For more information, see \ref min_cost_flow_algs "the module page".)
@@ -133,13 +133,13 @@
/// well-known strongly polynomial method
/// \cite goldberg89cyclecanceling. It improves along a
/// \ref min_mean_cycle "minimum mean cycle" in each iteration.
- /// Its running time complexity is O(n<sup>2</sup>e<sup>3</sup>log(n)).
+ /// Its running time complexity is O(n<sup>2</sup>m<sup>3</sup>log(n)).
MINIMUM_MEAN_CYCLE_CANCELING,
/// The "Cancel-and-Tighten" algorithm, which can be viewed as an
/// improved version of the previous method
/// \cite goldberg89cyclecanceling.
/// It is faster both in theory and in practice, its running time
- /// complexity is O(n<sup>2</sup>e<sup>2</sup>log(n)).
+ /// complexity is O(n<sup>2</sup>m<sup>2</sup>log(n)).
CANCEL_AND_TIGHTEN
};
@@ -576,7 +576,7 @@
/// \brief Return the total cost of the found flow.
///
/// This function returns the total cost of the found flow.
- /// Its complexity is O(e).
+ /// Its complexity is O(m).
///
/// \note The return type of the function can be specified as a
/// template parameter. For example,
diff --git a/lemon/gomory_hu.h b/lemon/gomory_hu.h
--- a/lemon/gomory_hu.h
+++ b/lemon/gomory_hu.h
@@ -46,7 +46,7 @@
/// of nodes can easily be obtained.
///
/// The algorithm calculates \e n-1 distinct minimum cuts (currently with
- /// the \ref Preflow algorithm), thus it has \f$O(n^3\sqrt{e})\f$ overall
+ /// the \ref Preflow algorithm), thus it has \f$O(n^3\sqrt{m})\f$ overall
/// time complexity. It calculates a rooted Gomory-Hu tree.
/// The structure of the tree and the edge weights can be
/// obtained using \c predNode(), \c predValue() and \c rootDist().
diff --git a/lemon/hartmann_orlin_mmc.h b/lemon/hartmann_orlin_mmc.h
--- a/lemon/hartmann_orlin_mmc.h
+++ b/lemon/hartmann_orlin_mmc.h
@@ -102,7 +102,7 @@
/// This method is based on \ref KarpMmc "Karp"'s original algorithm, but
/// applies an early termination scheme. It makes the algorithm
/// significantly faster for some problem instances, but slower for others.
- /// The algorithm runs in time O(ne) and uses space O(n<sup>2</sup>+e).
+ /// The algorithm runs in time O(nm) and uses space O(n<sup>2</sup>+m).
///
/// \tparam GR The type of the digraph the algorithm runs on.
/// \tparam CM The type of the cost map. The default
diff --git a/lemon/karp_mmc.h b/lemon/karp_mmc.h
--- a/lemon/karp_mmc.h
+++ b/lemon/karp_mmc.h
@@ -99,7 +99,7 @@
/// This class implements Karp's algorithm for finding a directed
/// cycle of minimum mean cost in a digraph
/// \cite karp78characterization, \cite dasdan98minmeancycle.
- /// It runs in time O(ne) and uses space O(n<sup>2</sup>+e).
+ /// It runs in time O(nm) and uses space O(n<sup>2</sup>+m).
///
/// \tparam GR The type of the digraph the algorithm runs on.
/// \tparam CM The type of the cost map. The default
diff --git a/lemon/min_cost_arborescence.h b/lemon/min_cost_arborescence.h
--- a/lemon/min_cost_arborescence.h
+++ b/lemon/min_cost_arborescence.h
@@ -101,7 +101,7 @@
/// more sources should be given to the algorithm and it will calculate
/// the minimum cost subgraph that is the union of arborescences with the
/// given sources and spans all the nodes which are reachable from the
- /// sources. The time complexity of the algorithm is O(n<sup>2</sup>+e).
+ /// sources. The time complexity of the algorithm is O(n<sup>2</sup>+m).
///
/// The algorithm also provides an optimal dual solution, therefore
/// the optimality of the solution can be checked.
diff --git a/lemon/network_simplex.h b/lemon/network_simplex.h
--- a/lemon/network_simplex.h
+++ b/lemon/network_simplex.h
@@ -973,7 +973,7 @@
/// \brief Return the total cost of the found flow.
///
/// This function returns the total cost of the found flow.
- /// Its complexity is O(e).
+ /// Its complexity is O(m).
///
/// \note The return type of the function can be specified as a
/// template parameter. For example,
diff --git a/lemon/preflow.h b/lemon/preflow.h
--- a/lemon/preflow.h
+++ b/lemon/preflow.h
@@ -107,7 +107,7 @@
/// The preflow algorithms are the fastest known maximum
/// flow algorithms. The current implementation uses a mixture of the
/// \e "highest label" and the \e "bound decrease" heuristics.
- /// The worst case time complexity of the algorithm is \f$O(n^2\sqrt{e})\f$.
+ /// The worst case time complexity of the algorithm is \f$O(n^2\sqrt{m})\f$.
///
/// The algorithm consists of two phases. After the first phase
/// the maximum flow value and the minimum cut is obtained. The
diff --git a/lemon/suurballe.h b/lemon/suurballe.h
--- a/lemon/suurballe.h
+++ b/lemon/suurballe.h
@@ -682,7 +682,7 @@
///
/// This function returns the total length of the found paths, i.e.
/// the total cost of the found flow.
- /// The complexity of the function is O(e).
+ /// The complexity of the function is O(m).
///
/// \pre \ref run() or \ref findFlow() must be called before using
/// this function.
More information about the Lemon-commits
mailing list