[Lemon-commits] Alpar Juttner: Unify the sources (#339)
Lemon HG
hg at lemon.cs.elte.hu
Wed Mar 17 14:18:34 CET 2010
details: http://lemon.cs.elte.hu/hg/lemon/rev/141f9c0db4a3
changeset: 956:141f9c0db4a3
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Sat Mar 06 14:35:12 2010 +0000
description:
Unify the sources (#339)
diffstat:
demo/arg_parser_demo.cc | 4 +-
doc/groups.dox | 2 +-
doc/mainpage.dox | 6 +-
doc/min_cost_flow.dox | 6 +-
lemon/adaptors.h | 84 ++++++------
lemon/arg_parser.cc | 6 +-
lemon/arg_parser.h | 12 +-
lemon/bellman_ford.h | 278 +++++++++++++++++++-------------------
lemon/bfs.h | 14 +-
lemon/binomial_heap.h | 12 +-
lemon/bits/array_map.h | 4 +-
lemon/bits/default_map.h | 4 +-
lemon/bits/edge_set_extender.h | 222 +++++++++++++++---------------
lemon/bits/solver_bits.h | 2 +-
lemon/bits/windows.cc | 4 +-
lemon/bucket_heap.h | 4 +-
lemon/capacity_scaling.h | 28 ++--
lemon/cbc.h | 4 +-
lemon/circulation.h | 12 +-
lemon/clp.cc | 2 +-
lemon/clp.h | 4 +-
lemon/concepts/digraph.h | 4 +-
lemon/concepts/graph.h | 8 +-
lemon/concepts/graph_components.h | 46 +++---
lemon/concepts/heap.h | 22 +-
lemon/connectivity.h | 20 +-
lemon/core.h | 7 +-
lemon/cost_scaling.h | 82 +++++-----
lemon/cplex.cc | 6 +-
lemon/cycle_canceling.h | 48 +++---
lemon/dfs.h | 14 +-
lemon/dijkstra.h | 2 +-
lemon/dimacs.h | 14 +-
lemon/edge_set.h | 2 +-
lemon/euler.h | 12 +-
lemon/fractional_matching.h | 4 +-
lemon/full_graph.h | 10 +-
lemon/glpk.cc | 8 +-
lemon/glpk.h | 14 +-
lemon/gomory_hu.h | 178 ++++++++++++------------
lemon/graph_to_eps.h | 2 +-
lemon/hao_orlin.h | 20 +-
lemon/hartmann_orlin_mmc.h | 22 +-
lemon/howard_mmc.h | 22 +-
lemon/karp_mmc.h | 12 +-
lemon/lgf_reader.h | 16 +-
lemon/lgf_writer.h | 16 +-
lemon/list_graph.h | 10 +-
lemon/lp.h | 4 +-
lemon/lp_base.cc | 2 +-
lemon/lp_base.h | 92 ++++++------
lemon/lp_skeleton.cc | 2 +-
lemon/lp_skeleton.h | 6 +-
lemon/maps.h | 22 +-
lemon/matching.h | 30 ++--
lemon/math.h | 4 +-
lemon/min_cost_arborescence.h | 8 +-
lemon/network_simplex.h | 38 ++--
lemon/path.h | 8 +-
lemon/planarity.h | 14 +-
lemon/preflow.h | 2 +-
lemon/smart_graph.h | 10 +-
lemon/soplex.cc | 4 +-
lemon/soplex.h | 2 +-
lemon/static_graph.h | 62 ++++----
lemon/suurballe.h | 24 +-
lemon/unionfind.h | 2 +-
test/bellman_ford_test.cc | 24 +-
test/bfs_test.cc | 12 +-
test/circulation_test.cc | 8 +-
test/connectivity_test.cc | 38 ++--
test/dfs_test.cc | 8 +-
test/digraph_test.cc | 10 +-
test/dijkstra_test.cc | 10 +-
test/edge_set_test.cc | 2 +-
test/euler_test.cc | 14 +-
test/fractional_matching_test.cc | 10 +-
test/gomory_hu_test.cc | 26 +++-
test/graph_test.cc | 6 +-
test/hao_orlin_test.cc | 18 +-
test/maps_test.cc | 107 +++++++-------
test/matching_test.cc | 18 +-
test/min_cost_arborescence_test.cc | 8 +-
test/min_cost_flow_test.cc | 32 ++--
test/min_mean_cycle_test.cc | 18 +-
test/preflow_test.cc | 6 +-
test/suurballe_test.cc | 18 +-
test/test_tools.h | 4 +-
tools/dimacs-solver.cc | 12 +-
89 files changed, 1054 insertions(+), 1026 deletions(-)
diffs (truncated from 7256 to 300 lines):
diff --git a/demo/arg_parser_demo.cc b/demo/arg_parser_demo.cc
--- a/demo/arg_parser_demo.cc
+++ b/demo/arg_parser_demo.cc
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2010
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -69,7 +69,7 @@
// exit(1) on these cases, but this makes Valgrind falsely warn
// about memory leaks.
ap.throwOnProblems();
-
+
// Perform the parsing process
// (in case of any error it terminates the program)
// The try {} construct is necessary only if the ap.trowOnProblems()
diff --git a/doc/groups.dox b/doc/groups.dox
--- a/doc/groups.dox
+++ b/doc/groups.dox
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2010
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff --git a/doc/mainpage.dox b/doc/mainpage.dox
--- a/doc/mainpage.dox
+++ b/doc/mainpage.dox
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2010
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -25,7 +25,7 @@
and <b>O</b>ptimization in <b>N</b>etworks</i>.
It is a C++ template library providing efficient implementations of common
data structures and algorithms with focus on combinatorial optimization
-tasks connected mainly with graphs and networks.
+tasks connected mainly with graphs and networks.
<b>
LEMON is an <a class="el" href="http://opensource.org/">open source</a>
@@ -35,7 +35,7 @@
\ref license "license terms".
</b>
-The project is maintained by the
+The project is maintained by the
<a href="http://www.cs.elte.hu/egres/">Egerváry Research Group on
Combinatorial Optimization</a> \ref egres
at the Operations Research Department of the
diff --git a/doc/min_cost_flow.dox b/doc/min_cost_flow.dox
--- a/doc/min_cost_flow.dox
+++ b/doc/min_cost_flow.dox
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2010
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -81,7 +81,7 @@
- \f$\pi(u)\leq 0\f$;
- if \f$\sum_{uv\in A} f(uv) - \sum_{vu\in A} f(vu) \neq sup(u)\f$,
then \f$\pi(u)=0\f$.
-
+
Here \f$cost^\pi(uv)\f$ denotes the \e reduced \e cost of the arc
\f$uv\in A\f$ with respect to the potential function \f$\pi\f$, i.e.
\f[ cost^\pi(uv) = cost(uv) + \pi(u) - \pi(v).\f]
@@ -119,7 +119,7 @@
sup(u) \quad \forall u\in V \f]
\f[ lower(uv) \leq f(uv) \leq upper(uv) \quad \forall uv\in A \f]
-It means that the total demand must be less or equal to the
+It means that the total demand must be less or equal to the
total supply (i.e. \f$\sum_{u\in V} sup(u)\f$ must be zero or
positive) and all the demands have to be satisfied, but there
could be supplies that are not carried out from the supply
diff --git a/lemon/adaptors.h b/lemon/adaptors.h
--- a/lemon/adaptors.h
+++ b/lemon/adaptors.h
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2010
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -421,7 +421,7 @@
void initialize(DGR& digraph, NF& node_filter, AF& arc_filter) {
Parent::initialize(digraph);
_node_filter = &node_filter;
- _arc_filter = &arc_filter;
+ _arc_filter = &arc_filter;
}
public:
@@ -508,11 +508,11 @@
public:
template <typename V>
- class NodeMap
- : public SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
- LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> {
+ class NodeMap
+ : public SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
+ LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> {
typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
- LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> Parent;
+ LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> Parent;
public:
typedef V Value;
@@ -535,9 +535,9 @@
};
template <typename V>
- class ArcMap
+ class ArcMap
: public SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
- LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> {
+ LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> {
typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> Parent;
@@ -582,7 +582,7 @@
void initialize(DGR& digraph, NF& node_filter, AF& arc_filter) {
Parent::initialize(digraph);
_node_filter = &node_filter;
- _arc_filter = &arc_filter;
+ _arc_filter = &arc_filter;
}
public:
@@ -651,10 +651,10 @@
}
template <typename V>
- class NodeMap
+ class NodeMap
: public SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> {
- typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
+ typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> Parent;
public:
@@ -678,7 +678,7 @@
};
template <typename V>
- class ArcMap
+ class ArcMap
: public SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> {
typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
@@ -1021,10 +1021,10 @@
}
template <typename V>
- class NodeMap
+ class NodeMap
: public SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> {
- typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
+ typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> Parent;
public:
@@ -1048,10 +1048,10 @@
};
template <typename V>
- class ArcMap
+ class ArcMap
: public SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> {
- typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
+ typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> Parent;
public:
@@ -1075,10 +1075,10 @@
};
template <typename V>
- class EdgeMap
+ class EdgeMap
: public SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> {
- typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
+ typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> Parent;
public:
@@ -1117,8 +1117,8 @@
protected:
NF* _node_filter;
EF* _edge_filter;
- SubGraphBase()
- : Parent(), _node_filter(0), _edge_filter(0) { }
+ SubGraphBase()
+ : Parent(), _node_filter(0), _edge_filter(0) { }
void initialize(GR& graph, NF& node_filter, EF& edge_filter) {
Parent::initialize(graph);
@@ -1219,10 +1219,10 @@
}
template <typename V>
- class NodeMap
+ class NodeMap
: public SubMapExtender<SubGraphBase<GR, NF, EF, false>,
LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> {
- typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
+ typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> Parent;
public:
@@ -1246,10 +1246,10 @@
};
template <typename V>
- class ArcMap
+ class ArcMap
: public SubMapExtender<SubGraphBase<GR, NF, EF, false>,
LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> {
- typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
+ typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> Parent;
public:
@@ -1273,11 +1273,11 @@
};
template <typename V>
- class EdgeMap
+ class EdgeMap
: public SubMapExtender<SubGraphBase<GR, NF, EF, false>,
LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> {
- typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
- LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> Parent;
+ typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
+ LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> Parent;
public:
typedef V Value;
@@ -1504,7 +1504,7 @@
true> > {
#endif
typedef DigraphAdaptorExtender<
- SubDigraphBase<GR, NF, ConstMap<typename GR::Arc, Const<bool, true> >,
+ SubDigraphBase<GR, NF, ConstMap<typename GR::Arc, Const<bool, true> >,
true> > Parent;
public:
@@ -1525,7 +1525,7 @@
///
/// Creates a subgraph for the given digraph or graph with the
/// given node filter map.
- FilterNodes(GR& graph, NF& node_filter)
+ FilterNodes(GR& graph, NF& node_filter)
: Parent(), const_true_map()
{
Parent::initialize(graph, node_filter, const_true_map);
@@ -1563,11 +1563,11 @@
class FilterNodes<GR, NF,
typename enable_if<UndirectedTagIndicator<GR> >::type> :
public GraphAdaptorExtender<
- SubGraphBase<GR, NF, ConstMap<typename GR::Edge, Const<bool, true> >,
+ SubGraphBase<GR, NF, ConstMap<typename GR::Edge, Const<bool, true> >,
true> > {
typedef GraphAdaptorExtender<
- SubGraphBase<GR, NF, ConstMap<typename GR::Edge, Const<bool, true> >,
+ SubGraphBase<GR, NF, ConstMap<typename GR::Edge, Const<bool, true> >,
true> > Parent;
public:
@@ -1653,7 +1653,7 @@
AF, false> > {
#endif
typedef DigraphAdaptorExtender<
More information about the Lemon-commits
mailing list