[Lemon-commits] Alpar Juttner: Apply unify-sources.sh to the sou...
Lemon HG
hg at lemon.cs.elte.hu
Sun Jul 13 21:14:18 CEST 2008
details: http://lemon.cs.elte.hu/hg/lemon/rev/765619b7cbb2
changeset: 209:765619b7cbb2
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Sun Jul 13 19:51:02 2008 +0100
description:
Apply unify-sources.sh to the source tree
diffstat:
80 files changed, 5898 insertions(+), 5899 deletions(-)
demo/arg_parser_demo.cc | 12
demo/graph_to_eps_demo.cc | 18
demo/lgf_demo.cc | 8
doc/coding_style.dox | 16
doc/dirs.dox | 6
doc/groups.dox | 104 +-
doc/lgf.dox | 8
doc/license.dox | 4
doc/mainpage.dox | 12
doc/namespaces.dox | 4
doc/template.h | 4
lemon/arg_parser.cc | 274 ++---
lemon/arg_parser.h | 172 +--
lemon/assert.h | 88 -
lemon/base.cc | 4
lemon/bfs.h | 458 ++++-----
lemon/bin_heap.h | 88 -
lemon/bits/alteration_notifier.h | 116 +-
lemon/bits/array_map.h | 218 ++--
lemon/bits/base_extender.h | 166 +--
lemon/bits/bezier.h | 32
lemon/bits/default_map.h | 18
lemon/bits/graph_extender.h | 294 ++---
lemon/bits/invalid.h | 8
lemon/bits/map_extender.h | 140 +-
lemon/bits/path_dump.h | 44
lemon/bits/traits.h | 73 -
lemon/bits/utility.h | 16
lemon/bits/vector_map.h | 66 -
lemon/color.cc | 8
lemon/color.h | 16
lemon/concept_check.h | 6
lemon/concepts/digraph.h | 120 +-
lemon/concepts/graph.h | 222 ++--
lemon/concepts/graph_components.h | 760 +++++++--------
lemon/concepts/heap.h | 130 +-
lemon/concepts/maps.h | 116 +-
lemon/concepts/path.h | 104 +-
lemon/counter.h | 38
lemon/dfs.h | 502 +++++-----
lemon/dijkstra.h | 360 +++----
lemon/dim2.h | 156 +--
lemon/error.h | 96 -
lemon/graph_to_eps.h | 538 +++++-----
lemon/graph_utils.h | 1120 +++++++++++-----------
lemon/kruskal.h | 76 -
lemon/lgf_reader.h | 1836 ++++++++++++++++++-------------------
lemon/lgf_writer.h | 926 +++++++++---------
lemon/list_graph.h | 584 +++++------
lemon/maps.h | 30
lemon/math.h | 8
lemon/path.h | 86 -
lemon/random.cc | 4
lemon/random.h | 226 ++--
lemon/smart_graph.h | 200 ++--
lemon/time_measure.h | 116 +-
lemon/tolerance.h | 12
lemon/unionfind.h | 508 +++++-----
test/bfs_test.cc | 36
test/counter_test.cc | 8
test/dfs_test.cc | 34
test/digraph_test.cc | 10
test/dijkstra_test.cc | 32
test/dim_test.cc | 4
test/error_test.cc | 8
test/graph_copy_test.cc | 20
test/graph_maps_test.h | 16
test/graph_test.cc | 20
test/graph_test.h | 8
test/graph_utils_test.cc | 20
test/heap_test.cc | 100 +-
test/kruskal_test.cc | 48
test/maps_test.cc | 8
test/path_test.cc | 6
test/random_test.cc | 8
test/test_tools.h | 4
test/test_tools_fail.cc | 6
test/test_tools_pass.cc | 6
test/time_measure_test.cc | 14
test/unionfind_test.cc | 6
diffs (truncated from 25505 to 300 lines):
diff -r 4317d277ba21 -r 765619b7cbb2 demo/arg_parser_demo.cc
--- a/demo/arg_parser_demo.cc Sun Jul 13 16:46:56 2008 +0100
+++ b/demo/arg_parser_demo.cc Sun Jul 13 19:51:02 2008 +0100
@@ -1,6 +1,6 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
*
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
*
* Copyright (C) 2003-2008
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -64,7 +64,7 @@
// Add non-parsed arguments (e.g. input files)
ap.other("infile", "The input file.")
.other("...");
-
+
// Perform the parsing process
// (in case of any error it terminates the program)
ap.parse();
@@ -84,7 +84,7 @@
if(ap.given("gra")) std::cout << " -gra is given\n";
if(ap.given("grb")) std::cout << " -grb is given\n";
if(ap.given("grc")) std::cout << " -grc is given\n";
-
+
switch(ap.files().size()) {
case 0:
std::cout << " No file argument was given.\n";
@@ -94,10 +94,10 @@
break;
default:
std::cout << " "
- << ap.files().size() << " file arguments were given. They are:\n";
+ << ap.files().size() << " file arguments were given. They are:\n";
}
for(unsigned int i=0;i<ap.files().size();++i)
std::cout << " '" << ap.files()[i] << "'\n";
-
+
return 0;
}
diff -r 4317d277ba21 -r 765619b7cbb2 demo/graph_to_eps_demo.cc
--- a/demo/graph_to_eps_demo.cc Sun Jul 13 16:46:56 2008 +0100
+++ b/demo/graph_to_eps_demo.cc Sun Jul 13 19:51:02 2008 +0100
@@ -1,6 +1,6 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
*
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
*
* Copyright (C) 2003-2008
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -49,7 +49,7 @@
typedef ListDigraph::NodeIt NodeIt;
typedef ListDigraph::Arc Arc;
typedef dim2::Point<int> Point;
-
+
Node n1=g.addNode();
Node n2=g.addNode();
Node n3=g.addNode();
@@ -62,13 +62,13 @@
ListDigraph::NodeMap<int> shapes(g);
ListDigraph::ArcMap<int> acolors(g);
ListDigraph::ArcMap<int> widths(g);
-
+
coords[n1]=Point(50,50); sizes[n1]=1; colors[n1]=1; shapes[n1]=0;
coords[n2]=Point(50,70); sizes[n2]=2; colors[n2]=2; shapes[n2]=2;
coords[n3]=Point(70,70); sizes[n3]=1; colors[n3]=3; shapes[n3]=0;
coords[n4]=Point(70,50); sizes[n4]=2; colors[n4]=4; shapes[n4]=1;
coords[n5]=Point(85,60); sizes[n5]=3; colors[n5]=5; shapes[n5]=2;
-
+
Arc a;
a=g.addArc(n1,n2); acolors[a]=0; widths[a]=1;
@@ -78,7 +78,7 @@
a=g.addArc(n4,n1); acolors[a]=0; widths[a]=1;
a=g.addArc(n2,n4); acolors[a]=1; widths[a]=2;
a=g.addArc(n3,n4); acolors[a]=2; widths[a]=1;
-
+
IdMap<ListDigraph,Node> id(g);
// Create five .eps files showing the digraph with different options
@@ -182,14 +182,14 @@
ListDigraph h;
ListDigraph::NodeMap<int> hcolors(h);
ListDigraph::NodeMap<Point> hcoords(h);
-
+
int cols=int(sqrt(double(palette.size())));
for(int i=0;i<int(paletteW.size());i++) {
Node n=h.addNode();
hcoords[n]=Point(1+i%cols,1+i/cols);
hcolors[n]=i;
}
-
+
cout << "Create 'graph_to_eps_demo_out_6_colors.eps'" << endl;
graphToEps(h,"graph_to_eps_demo_out_6_colors.eps").
scale(60).
@@ -202,6 +202,6 @@
nodeTexts(hcolors).nodeTextSize(.6).
nodeColors(composeMap(paletteW,hcolors)).
run();
-
+
return 0;
}
diff -r 4317d277ba21 -r 765619b7cbb2 demo/lgf_demo.cc
--- a/demo/lgf_demo.cc Sun Jul 13 16:46:56 2008 +0100
+++ b/demo/lgf_demo.cc Sun Jul 13 19:51:02 2008 +0100
@@ -1,6 +1,6 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
*
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
*
* Copyright (C) 2003-2008
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -21,7 +21,7 @@
///\brief Demonstrating graph input and output
///
/// This program gives an example of how to read and write a digraph
-/// and additional maps from/to a stream or a file using the
+/// and additional maps from/to a stream or a file using the
/// \ref lgf-format "LGF" format.
///
/// The \c "digraph.lgf" file:
@@ -42,7 +42,7 @@
SmartDigraph g;
SmartDigraph::ArcMap<int> cap(g);
SmartDigraph::Node s, t;
-
+
try {
digraphReader("digraph.lgf", g). // read the directed graph into g
arcMap("capacity", cap). // read the 'capacity' arc map into cap
diff -r 4317d277ba21 -r 765619b7cbb2 doc/coding_style.dox
--- a/doc/coding_style.dox Sun Jul 13 16:46:56 2008 +0100
+++ b/doc/coding_style.dox Sun Jul 13 19:51:02 2008 +0100
@@ -1,6 +1,6 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
*
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
*
* Copyright (C) 2003-2008
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -18,7 +18,7 @@
/*!
-\page coding_style LEMON Coding Style
+\page coding_style LEMON Coding Style
\section naming_conv Naming Conventions
@@ -68,7 +68,7 @@
The name of a class or any type should look like the following.
\code
-AllWordsCapitalizedWithoutUnderscores
+AllWordsCapitalizedWithoutUnderscores
\endcode
\subsection cs-func Methods and other functions
@@ -76,7 +76,7 @@
The name of a function should look like the following.
\code
-firstWordLowerCaseRestCapitalizedWithoutUnderscores
+firstWordLowerCaseRestCapitalizedWithoutUnderscores
\endcode
\subsection cs-funcs Constants, Macros
@@ -84,15 +84,15 @@
The names of constants and macros should look like the following.
\code
-ALL_UPPER_CASE_WITH_UNDERSCORES
+ALL_UPPER_CASE_WITH_UNDERSCORES
\endcode
-\subsection cs-loc-var Class and instance member variables, auto variables
+\subsection cs-loc-var Class and instance member variables, auto variables
The names of class and instance member variables and auto variables (=variables used locally in methods) should look like the following.
\code
-all_lower_case_with_underscores
+all_lower_case_with_underscores
\endcode
\subsection pri-loc-var Private member variables
diff -r 4317d277ba21 -r 765619b7cbb2 doc/dirs.dox
--- a/doc/dirs.dox Sun Jul 13 16:46:56 2008 +0100
+++ b/doc/dirs.dox Sun Jul 13 19:51:02 2008 +0100
@@ -1,6 +1,6 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
*
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
*
* Copyright (C) 2003-2008
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -74,6 +74,6 @@
\brief Implementation helper files
This directory contains some helper classes to implement graphs, maps and
-some other classes. As a user you typically don't have to deal with these
+some other classes. As a user you typically don't have to deal with these
files.
*/
diff -r 4317d277ba21 -r 765619b7cbb2 doc/groups.dox
--- a/doc/groups.dox Sun Jul 13 16:46:56 2008 +0100
+++ b/doc/groups.dox Sun Jul 13 19:51:02 2008 +0100
@@ -1,6 +1,6 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
*
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
*
* Copyright (C) 2003-2008
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -26,10 +26,10 @@
@ingroup datas
\brief Graph structures implemented in LEMON.
-The implementation of combinatorial algorithms heavily relies on
-efficient graph implementations. LEMON offers data structures which are
-planned to be easily used in an experimental phase of implementation studies,
-and thereafter the program code can be made efficient by small modifications.
+The implementation of combinatorial algorithms heavily relies on
+efficient graph implementations. LEMON offers data structures which are
+planned to be easily used in an experimental phase of implementation studies,
+and thereafter the program code can be made efficient by small modifications.
The most efficient implementation of diverse applications require the
usage of different physical graph implementations. These differences
@@ -40,21 +40,21 @@
running time or on memory usage, some structures may fail to provide
some graph features like arc/edge or node deletion.
-Alteration of standard containers need a very limited number of
-operations, these together satisfy the everyday requirements.
-In the case of graph structures, different operations are needed which do
-not alter the physical graph, but gives another view. If some nodes or
+Alteration of standard containers need a very limited number of
+operations, these together satisfy the everyday requirements.
+In the case of graph structures, different operations are needed which do
+not alter the physical graph, but gives another view. If some nodes or
arcs have to be hidden or the reverse oriented graph have to be used, then
-this is the case. It also may happen that in a flow implementation
-the residual graph can be accessed by another algorithm, or a node-set
-is to be shrunk for another algorithm.
-LEMON also provides a variety of graphs for these requirements called
-\ref graph_adaptors "graph adaptors". Adaptors cannot be used alone but only
-in conjunction with other graph representations.
+this is the case. It also may happen that in a flow implementation
+the residual graph can be accessed by another algorithm, or a node-set
+is to be shrunk for another algorithm.
+LEMON also provides a variety of graphs for these requirements called
+\ref graph_adaptors "graph adaptors". Adaptors cannot be used alone but only
+in conjunction with other graph representations.
You are free to use the graph structure that fit your requirements
the best, most graph algorithms and auxiliary data structures can be used
-with any graph structures.
+with any graph structures.
*/
/**
@@ -63,12 +63,12 @@
\brief Graph types between real graphs and graph adaptors.
This group describes some graph types between real graphs and graph adaptors.
-These classes wrap graphs to give new functionality as the adaptors do it.
+These classes wrap graphs to give new functionality as the adaptors do it.
On the other hand they are not light-weight structures as the adaptors.
*/
/**
- at defgroup maps Maps
+ at defgroup maps Maps
@ingroup datas
\brief Map structures implemented in LEMON.
@@ -79,7 +79,7 @@
*/
More information about the Lemon-commits
mailing list