[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/c59bdcc8e33e
changeset: 1078:c59bdcc8e33e
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Fri Aug 05 00:17:29 2011 +0200
description:
Unify sources
diffstat:
doc/dirs.dox | 4 ++--
doc/groups.dox | 4 ++--
doc/lgf.dox | 2 +-
lemon/base.cc | 2 +-
lemon/bits/default_map.h | 2 +-
lemon/bits/map_extender.h | 2 +-
lemon/bits/path_dump.h | 2 +-
lemon/bits/windows.cc | 4 ++--
lemon/core.h | 2 +-
lemon/dfs.h | 2 +-
lemon/graph_to_eps.h | 2 +-
lemon/lgf_reader.h | 10 +++++-----
lemon/lgf_writer.h | 6 +++---
lemon/list_graph.h | 6 +++---
lemon/path.h | 8 ++++----
lemon/random.h | 2 +-
lemon/smart_graph.h | 6 +++---
lemon/time_measure.h | 2 +-
lemon/tolerance.h | 2 +-
lemon/unionfind.h | 4 ++--
test/dfs_test.cc | 4 ++--
test/graph_copy_test.cc | 8 ++++----
test/lgf_test.cc | 12 ++++++------
test/maps_test.cc | 11 +++++++----
24 files changed, 56 insertions(+), 53 deletions(-)
diffs (truncated from 516 to 300 lines):
diff --git a/doc/dirs.dox b/doc/dirs.dox
--- a/doc/dirs.dox
+++ b/doc/dirs.dox
@@ -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 --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-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 --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-2008
+ * Copyright (C) 2003-2011
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
diff --git a/lemon/base.cc b/lemon/base.cc
--- a/lemon/base.cc
+++ b/lemon/base.cc
@@ -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 --git a/lemon/bits/default_map.h b/lemon/bits/default_map.h
--- a/lemon/bits/default_map.h
+++ b/lemon/bits/default_map.h
@@ -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 --git a/lemon/bits/map_extender.h b/lemon/bits/map_extender.h
--- a/lemon/bits/map_extender.h
+++ b/lemon/bits/map_extender.h
@@ -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 --git a/lemon/bits/path_dump.h b/lemon/bits/path_dump.h
--- a/lemon/bits/path_dump.h
+++ b/lemon/bits/path_dump.h
@@ -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 --git a/lemon/bits/windows.cc b/lemon/bits/windows.cc
--- a/lemon/bits/windows.cc
+++ b/lemon/bits/windows.cc
@@ -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 --git a/lemon/core.h b/lemon/core.h
--- a/lemon/core.h
+++ b/lemon/core.h
@@ -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 --git a/lemon/dfs.h b/lemon/dfs.h
--- a/lemon/dfs.h
+++ b/lemon/dfs.h
@@ -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 --git a/lemon/graph_to_eps.h b/lemon/graph_to_eps.h
--- a/lemon/graph_to_eps.h
+++ b/lemon/graph_to_eps.h
@@ -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 --git a/lemon/lgf_reader.h b/lemon/lgf_reader.h
--- a/lemon/lgf_reader.h
+++ b/lemon/lgf_reader.h
@@ -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 --git a/lemon/lgf_writer.h b/lemon/lgf_writer.h
--- a/lemon/lgf_writer.h
+++ b/lemon/lgf_writer.h
@@ -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 --git a/lemon/list_graph.h b/lemon/list_graph.h
--- a/lemon/list_graph.h
+++ b/lemon/list_graph.h
@@ -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 --git a/lemon/path.h b/lemon/path.h
--- a/lemon/path.h
+++ b/lemon/path.h
@@ -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 --git a/lemon/random.h b/lemon/random.h
--- a/lemon/random.h
+++ b/lemon/random.h
@@ -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
More information about the Lemon-commits
mailing list