[Lemon-commits] Alpar Juttner: Unify sources
Lemon HG
hg at lemon.cs.elte.hu
Mon Aug 8 15:01:33 CEST 2011
details: http://lemon.cs.elte.hu/hg/lemon/rev/f1398882a928
changeset: 1081:f1398882a928
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Mon Aug 08 12:36:16 2011 +0200
description:
Unify sources
diffstat:
doc/groups.dox | 6 +-
doc/lgf.dox | 2 +-
doc/min_cost_flow.dox | 6 +-
lemon/adaptors.h | 84 ++++++------
lemon/bin_heap.h | 2 +-
lemon/bits/array_map.h | 4 +-
lemon/bits/default_map.h | 4 +-
lemon/bits/edge_set_extender.h | 222 ++++++++++++++++++------------------
lemon/bits/graph_adaptor_extender.h | 2 +-
lemon/bits/map_extender.h | 2 +-
lemon/bits/path_dump.h | 2 +-
lemon/bits/solver_bits.h | 2 +-
lemon/bits/windows.cc | 4 +-
lemon/cbc.h | 4 +-
lemon/circulation.h | 12 +-
lemon/clp.cc | 2 +-
lemon/clp.h | 4 +-
lemon/concepts/digraph.h | 4 +-
lemon/concepts/graph_components.h | 46 +++---
lemon/concepts/maps.h | 2 +-
lemon/connectivity.h | 20 +-
lemon/core.h | 7 +-
lemon/cplex.cc | 4 +-
lemon/dfs.h | 2 +-
lemon/dimacs.h | 14 +-
lemon/edge_set.h | 2 +-
lemon/euler.h | 12 +-
lemon/glpk.h | 14 +-
lemon/gomory_hu.h | 184 ++++++++++++++--------------
lemon/graph_to_eps.h | 2 +-
lemon/hao_orlin.h | 20 +-
lemon/lgf_reader.h | 14 +-
lemon/lgf_writer.h | 16 +-
lemon/lp.h | 4 +-
lemon/lp_base.cc | 2 +-
lemon/lp_base.h | 90 +++++++-------
lemon/lp_skeleton.cc | 2 +-
lemon/lp_skeleton.h | 6 +-
lemon/maps.h | 12 +-
lemon/matching.h | 94 +++++++-------
lemon/math.h | 4 +-
lemon/min_cost_arborescence.h | 8 +-
lemon/network_simplex.h | 26 ++--
lemon/path.h | 8 +-
lemon/preflow.h | 8 +-
lemon/soplex.cc | 4 +-
lemon/soplex.h | 2 +-
lemon/suurballe.h | 2 +-
lemon/unionfind.h | 2 +-
test/bfs_test.cc | 12 +-
test/circulation_test.cc | 6 +-
test/connectivity_test.cc | 38 +++---
test/dfs_test.cc | 10 +-
test/dijkstra_test.cc | 10 +-
test/edge_set_test.cc | 2 +-
test/euler_test.cc | 14 +-
test/gomory_hu_test.cc | 26 +++-
test/graph_copy_test.cc | 8 +-
test/hao_orlin_test.cc | 18 +-
test/heap_test.cc | 2 +-
test/lgf_test.cc | 12 +-
test/maps_test.cc | 19 +-
test/matching_test.cc | 14 +-
test/min_cost_arborescence_test.cc | 8 +-
test/min_cost_flow_test.cc | 32 ++--
test/preflow_test.cc | 8 +-
test/suurballe_test.cc | 8 +-
tools/dimacs-solver.cc | 12 +-
68 files changed, 641 insertions(+), 619 deletions(-)
diffs (truncated from 4380 to 300 lines):
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-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -275,7 +275,7 @@
This group contains the algorithms for finding shortest paths in digraphs.
- - \ref Dijkstra Dijkstra's algorithm for finding shortest paths from a
+ - \ref Dijkstra Dijkstra's algorithm for finding shortest paths from a
source node when all arc lengths are non-negative.
- \ref Suurballe A successive shortest path algorithm for finding
arc-disjoint paths between two nodes having minimum total length.
@@ -306,7 +306,7 @@
minimum cut, which is the dual problem of maximum flow.
-\ref Circulation is a preflow push-relabel algorithm implemented directly
+\ref Circulation is a preflow push-relabel algorithm implemented directly
for finding feasible circulations, which is a somewhat different problem,
but it is strongly related to maximum flow.
For more information, see \ref Circulation.
diff --git a/doc/lgf.dox b/doc/lgf.dox
--- a/doc/lgf.dox
+++ b/doc/lgf.dox
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
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-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -81,7 +81,7 @@
- \f$\pi(u)<=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-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -418,7 +418,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:
@@ -505,11 +505,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;
@@ -532,9 +532,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;
@@ -579,7 +579,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:
@@ -648,10 +648,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:
@@ -675,7 +675,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>,
@@ -1016,10 +1016,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:
@@ -1043,10 +1043,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:
@@ -1070,10 +1070,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:
@@ -1112,8 +1112,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);
@@ -1214,10 +1214,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:
@@ -1241,10 +1241,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:
@@ -1268,11 +1268,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;
@@ -1495,7 +1495,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:
@@ -1516,7 +1516,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);
@@ -1554,11 +1554,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:
@@ -1642,7 +1642,7 @@
AF, false> > {
#endif
typedef DigraphAdaptorExtender<
- SubDigraphBase<DGR, ConstMap<typename DGR::Node, Const<bool, true> >,
+ SubDigraphBase<DGR, ConstMap<typename DGR::Node, Const<bool, true> >,
AF, false> > Parent;
public:
@@ -1748,11 +1748,11 @@
typename EF = typename GR::template EdgeMap<bool> >
class FilterEdges :
public GraphAdaptorExtender<
- SubGraphBase<GR, ConstMap<typename GR::Node, Const<bool, true> >,
+ SubGraphBase<GR, ConstMap<typename GR::Node, Const<bool, true> >,
EF, false> > {
#endif
typedef GraphAdaptorExtender<
- SubGraphBase<GR, ConstMap<typename GR::Node, Const<bool, true > >,
+ SubGraphBase<GR, ConstMap<typename GR::Node, Const<bool, true > >,
EF, false> > Parent;
public:
@@ -1777,7 +1777,7 @@
///
More information about the Lemon-commits
mailing list