# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1312496249 -7200
# Node ID c59bdcc8e33e6f8397d7c9b36b199db36e33ce46
# Parent 8276e0ee48b1542f6b96241ae47721aeb4d624ab
Unify sources
diff -r 8276e0ee48b1 -r c59bdcc8e33e doc/dirs.dox
--- a/doc/dirs.dox Fri Aug 05 00:12:23 2011 +0200
+++ b/doc/dirs.dox Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -71,7 +71,7 @@
\dir bits
\brief Auxiliary tools for implementation.
-This directory contains some auxiliary classes for implementing graphs,
+This directory contains some auxiliary classes for implementing graphs,
maps and some other classes.
As a user you typically don't have to deal with these files.
*/
diff -r 8276e0ee48b1 -r c59bdcc8e33e doc/groups.dox
--- a/doc/groups.dox Fri Aug 05 00:12:23 2011 +0200
+++ b/doc/groups.dox Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -303,7 +303,7 @@
@defgroup map_concepts Map Concepts
@ingroup concept
\brief Skeleton and concept checking classes for maps
-
+
This group describes the skeletons and concept checking classes of maps.
*/
diff -r 8276e0ee48b1 -r c59bdcc8e33e doc/lgf.dox
--- a/doc/lgf.dox Fri Aug 05 00:12:23 2011 +0200
+++ b/doc/lgf.dox Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/base.cc
--- a/lemon/base.cc Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/base.cc Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/bits/default_map.h
--- a/lemon/bits/default_map.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/bits/default_map.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/bits/map_extender.h
--- a/lemon/bits/map_extender.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/bits/map_extender.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/bits/path_dump.h
--- a/lemon/bits/path_dump.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/bits/path_dump.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/bits/windows.cc
--- a/lemon/bits/windows.cc Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/bits/windows.cc Fri Aug 05 00:17:29 2011 +0200
@@ -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).
*
@@ -96,7 +96,7 @@
SYSTEMTIME time;
GetSystemTime(&time);
char buf1[11], buf2[9], buf3[5];
- if (GetDateFormat(MY_LOCALE, 0, &time,
+ if (GetDateFormat(MY_LOCALE, 0, &time,
("ddd MMM dd"), buf1, 11) &&
GetTimeFormat(MY_LOCALE, 0, &time,
("HH':'mm':'ss"), buf2, 9) &&
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/core.h
--- a/lemon/core.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/core.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/dfs.h
--- a/lemon/dfs.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/dfs.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/graph_to_eps.h
--- a/lemon/graph_to_eps.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/graph_to_eps.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/lgf_reader.h
--- a/lemon/lgf_reader.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/lgf_reader.h Fri Aug 05 00:17:29 2011 +0200
@@ -391,7 +391,7 @@
class DigraphReader;
template <typename Digraph>
- DigraphReader<Digraph> digraphReader(Digraph& digraph,
+ DigraphReader<Digraph> digraphReader(Digraph& digraph,
std::istream& is = std::cin);
template <typename Digraph>
DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn);
@@ -563,7 +563,7 @@
template <typename DGR>
friend DigraphReader<DGR> digraphReader(DGR& digraph, std::istream& is);
template <typename DGR>
- friend DigraphReader<DGR> digraphReader(DGR& digraph,
+ friend DigraphReader<DGR> digraphReader(DGR& digraph,
const std::string& fn);
template <typename DGR>
friend DigraphReader<DGR> digraphReader(DGR& digraph, const char *fn);
@@ -1229,9 +1229,9 @@
template <typename Graph>
class GraphReader;
-
+
template <typename Graph>
- GraphReader<Graph> graphReader(Graph& graph,
+ GraphReader<Graph> graphReader(Graph& graph,
std::istream& is = std::cin);
template <typename Graph>
GraphReader<Graph> graphReader(Graph& graph, const std::string& fn);
@@ -1366,7 +1366,7 @@
template <typename GR>
friend GraphReader<GR> graphReader(GR& graph, std::istream& is);
template <typename GR>
- friend GraphReader<GR> graphReader(GR& graph, const std::string& fn);
+ friend GraphReader<GR> graphReader(GR& graph, const std::string& fn);
template <typename GR>
friend GraphReader<GR> graphReader(GR& graph, const char *fn);
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/lgf_writer.h
--- a/lemon/lgf_writer.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/lgf_writer.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -506,7 +506,7 @@
private:
template <typename DGR>
- friend DigraphWriter<DGR> digraphWriter(const DGR& digraph,
+ friend DigraphWriter<DGR> digraphWriter(const DGR& digraph,
std::ostream& os);
template <typename DGR>
friend DigraphWriter<DGR> digraphWriter(const DGR& digraph,
@@ -1082,7 +1082,7 @@
template <typename GR>
friend GraphWriter<GR> graphWriter(const GR& graph,
const char *fn);
-
+
GraphWriter(GraphWriter& other)
: _os(other._os), local_os(other.local_os), _graph(other._graph),
_skip_nodes(other._skip_nodes), _skip_edges(other._skip_edges) {
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/list_graph.h
--- a/lemon/list_graph.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/list_graph.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -840,8 +840,8 @@
explicit Arc(int pid) { id = pid;}
public:
- operator Edge() const {
- return id != -1 ? edgeFromId(id / 2) : INVALID;
+ operator Edge() const {
+ return id != -1 ? edgeFromId(id / 2) : INVALID;
}
Arc() {}
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/path.h
--- a/lemon/path.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/path.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -966,20 +966,20 @@
}
};
-
+
template <typename From, typename To,
bool revEnable = RevPathTagIndicator<From>::value>
struct PathCopySelector {
static void copy(const From& from, To& to) {
PathCopySelectorForward<From, To>::copy(from, to);
- }
+ }
};
template <typename From, typename To>
struct PathCopySelector<From, To, true> {
static void copy(const From& from, To& to) {
PathCopySelectorBackward<From, To>::copy(from, to);
- }
+ }
};
}
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/random.h
--- a/lemon/random.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/random.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/smart_graph.h
--- a/lemon/smart_graph.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/smart_graph.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -466,8 +466,8 @@
explicit Arc(int id) { _id = id;}
public:
- operator Edge() const {
- return _id != -1 ? edgeFromId(_id / 2) : INVALID;
+ operator Edge() const {
+ return _id != -1 ? edgeFromId(_id / 2) : INVALID;
}
Arc() {}
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/time_measure.h
--- a/lemon/time_measure.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/time_measure.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/tolerance.h
--- a/lemon/tolerance.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/tolerance.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff -r 8276e0ee48b1 -r c59bdcc8e33e lemon/unionfind.h
--- a/lemon/unionfind.h Fri Aug 05 00:12:23 2011 +0200
+++ b/lemon/unionfind.h Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -1189,7 +1189,7 @@
int ld = nodes[nodes[jd].next].left;
popLeft(nodes[jd].next);
pushRight(jd, ld);
- if (less(ld, nodes[jd].left) ||
+ if (less(ld, nodes[jd].left) ||
nodes[ld].item == nodes[pd].item) {
nodes[jd].item = nodes[ld].item;
nodes[jd].prio = nodes[ld].prio;
diff -r 8276e0ee48b1 -r c59bdcc8e33e test/dfs_test.cc
--- a/test/dfs_test.cc Fri Aug 05 00:12:23 2011 +0200
+++ b/test/dfs_test.cc Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -184,7 +184,7 @@
Dfs<Digraph> dfs(G);
check(dfs.run(s1,t1) && dfs.reached(t1),"Node 3 is reachable from Node 6.");
}
-
+
{
NullMap<Node,Arc> myPredMap;
dfs(G).predMap(myPredMap).run(s);
diff -r 8276e0ee48b1 -r c59bdcc8e33e test/graph_copy_test.cc
--- a/test/graph_copy_test.cc Fri Aug 05 00:12:23 2011 +0200
+++ b/test/graph_copy_test.cc Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -70,7 +70,7 @@
nodeRef(nr).arcRef(er).
nodeCrossRef(ncr).arcCrossRef(ecr).
node(fn, tn).arc(fa, ta).run();
-
+
check(countNodes(from) == countNodes(to), "Wrong copy.");
check(countArcs(from) == countArcs(to), "Wrong copy.");
@@ -98,7 +98,7 @@
// Test repeated copy
digraphCopy(from, to).run();
-
+
check(countNodes(from) == countNodes(to), "Wrong copy.");
check(countArcs(from) == countArcs(to), "Wrong copy.");
}
@@ -200,7 +200,7 @@
// Test repeated copy
graphCopy(from, to).run();
-
+
check(countNodes(from) == countNodes(to), "Wrong copy.");
check(countEdges(from) == countEdges(to), "Wrong copy.");
check(countArcs(from) == countArcs(to), "Wrong copy.");
diff -r 8276e0ee48b1 -r c59bdcc8e33e test/lgf_test.cc
--- a/test/lgf_test.cc Fri Aug 05 00:12:23 2011 +0200
+++ b/test/lgf_test.cc Fri Aug 05 00:17:29 2011 +0200
@@ -63,10 +63,10 @@
"0 1\n";
-int main()
+int main()
{
{
- ListDigraph d;
+ ListDigraph d;
ListDigraph::Node s,t;
ListDigraph::ArcMap<int> label(d);
std::istringstream input(test_lgf);
@@ -93,7 +93,7 @@
}
{
- ListDigraph d;
+ ListDigraph d;
std::istringstream input(test_lgf_nomap);
digraphReader(d, input).
run();
@@ -110,14 +110,14 @@
}
{
- ListDigraph d;
+ ListDigraph d;
std::istringstream input(test_lgf_bad1);
bool ok=false;
try {
digraphReader(d, input).
run();
}
- catch (FormatError& error)
+ catch (FormatError& error)
{
ok = true;
}
@@ -139,7 +139,7 @@
}
{
- ListDigraph d;
+ ListDigraph d;
std::istringstream input(test_lgf_bad2);
bool ok=false;
try {
diff -r 8276e0ee48b1 -r c59bdcc8e33e test/maps_test.cc
--- a/test/maps_test.cc Fri Aug 05 00:12:23 2011 +0200
+++ b/test/maps_test.cc Fri Aug 05 00:17:29 2011 +0200
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -69,8 +69,10 @@
checkConcept<WriteMap<A,C>, WriteMap<A,C> >();
checkConcept<ReadWriteMap<A,B>, ReadWriteMap<A,B> >();
checkConcept<ReadWriteMap<A,C>, ReadWriteMap<A,C> >();
- checkConcept<ReferenceMap<A,B,B&,const B&>, ReferenceMap<A,B,B&,const B&> >();
- checkConcept<ReferenceMap<A,C,C&,const C&>, ReferenceMap<A,C,C&,const C&> >();
+ checkConcept<ReferenceMap<A,B,B&,const B&>,
+ ReferenceMap<A,B,B&,const B&> >();
+ checkConcept<ReferenceMap<A,C,C&,const C&>,
+ ReferenceMap<A,C,C&,const C&> >();
// NullMap
{
@@ -199,7 +201,8 @@
B b = functorToMap(F())[A()];
checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
- MapToFunctor<ReadMap<A,B> > map = MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
+ MapToFunctor<ReadMap<A,B> > map =
+ MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
check(functorToMap(&func)[A()] == 3,
"Something is wrong with FunctorToMap");