[Lemon-commits] Alpar Juttner: Merge from trunk
Lemon HG
hg at lemon.cs.elte.hu
Mon Oct 13 15:48:37 CEST 2008
details: http://lemon.cs.elte.hu/hg/lemon/rev/12626fc94ccf
changeset: 327:12626fc94ccf
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Thu Oct 09 14:37:44 2008 +0100
description:
Merge from trunk
diffstat:
40 files changed, 1139 insertions(+), 957 deletions(-)
Makefile.am | 12 -
README | 4
configure.ac | 14 -
demo/arg_parser_demo.cc | 2
demo/graph_to_eps_demo.cc | 2
doc/Makefile.am | 1
doc/groups.dox | 36 +--
doc/lgf.dox | 2
doc/mainpage.dox | 5
doc/migration.dox | 143 ++++++++++++
lemon/arg_parser.cc | 5
lemon/arg_parser.h | 4
lemon/bfs.h | 92 +++----
lemon/bits/alteration_notifier.h | 432 +++++++++++++++++--------------------
lemon/bits/array_map.h | 168 +++++++-------
lemon/bits/base_extender.h | 34 +-
lemon/bits/bezier.h | 10
lemon/bits/default_map.h | 9
lemon/bits/enable_if.h | 24 +-
lemon/bits/graph_extender.h | 86 +++----
lemon/bits/map_extender.h | 16 -
lemon/bits/traits.h | 6
lemon/bits/vector_map.h | 170 +++++++-------
lemon/color.h | 2
lemon/concepts/graph_components.h | 2
lemon/concepts/maps.h | 4
lemon/core.h | 26 +-
lemon/dfs.h | 92 +++----
lemon/dijkstra.h | 68 ++---
lemon/dim2.h | 54 +---
lemon/graph_to_eps.h | 2
lemon/lgf_reader.h | 112 +++------
lemon/lgf_writer.h | 114 +++------
lemon/list_graph.h | 2
lemon/maps.h | 184 ++++++++-------
lemon/path.h | 2
lemon/smart_graph.h | 8
lemon/time_measure.h | 19 -
tools/Makefile.am | 1
tools/lemon-0.x-to-1.x.sh | 127 ++++++++++
diffs (truncated from 4196 to 300 lines):
diff -r de38fca76780 -r 12626fc94ccf Makefile.am
--- a/Makefile.am Thu Oct 09 13:52:01 2008 +0100
+++ b/Makefile.am Thu Oct 09 14:37:44 2008 +0100
@@ -24,6 +24,7 @@
noinst_PROGRAMS =
bin_PROGRAMS =
check_PROGRAMS =
+dist_bin_SCRIPTS =
TESTS =
XFAIL_TESTS =
@@ -31,7 +32,6 @@
include test/Makefile.am
include doc/Makefile.am
include demo/Makefile.am
-include benchmark/Makefile.am
include tools/Makefile.am
MRPROPERFILES = \
diff -r de38fca76780 -r 12626fc94ccf README
--- a/README Thu Oct 09 13:52:01 2008 +0100
+++ b/README Thu Oct 09 14:37:44 2008 +0100
@@ -37,10 +37,6 @@
Contains programs to check the integrity and correctness of LEMON.
-benchmark/
-
- Contains programs for measuring the performance of algorithms.
-
tools/
Various utilities related to LEMON.
diff -r de38fca76780 -r 12626fc94ccf benchmark/Makefile.am
--- a/benchmark/Makefile.am Thu Oct 09 13:52:01 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-if WANT_BENCHMARK
-
-noinst_HEADERS +=
-
-noinst_PROGRAMS +=
-
-endif WANT_BENCHMARK
diff -r de38fca76780 -r 12626fc94ccf configure.ac
--- a/configure.ac Thu Oct 09 13:52:01 2008 +0100
+++ b/configure.ac Thu Oct 09 14:37:44 2008 +0100
@@ -81,19 +81,6 @@
fi
AM_CONDITIONAL([WANT_TOOLS], [test x"$enable_tools" != x"no"])
-dnl Disable/enable building the benchmarks.
-AC_ARG_ENABLE([benchmark],
-AS_HELP_STRING([--enable-benchmark], [build the benchmarks])
-AS_HELP_STRING([--disable-benchmark], [do not build the benchmarks @<:@default@:>@]),
- [], [enable_benchmark=no])
-AC_MSG_CHECKING([whether to build the benchmarks])
-if test x"$enable_benchmark" != x"no"; then
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-AM_CONDITIONAL([WANT_BENCHMARK], [test x"$enable_benchmark" != x"no"])
-
dnl Checks for header files.
AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
@@ -132,7 +119,6 @@
#echo CPLEX support................. : $lx_cplex_found
#echo SOPLEX support................ : $lx_soplex_found
#echo
-echo Build benchmarks.............. : $enable_benchmark
echo Build demo programs........... : $enable_demo
echo Build additional tools........ : $enable_tools
echo
diff -r de38fca76780 -r 12626fc94ccf demo/arg_parser_demo.cc
--- a/demo/arg_parser_demo.cc Thu Oct 09 13:52:01 2008 +0100
+++ b/demo/arg_parser_demo.cc Thu Oct 09 14:37:44 2008 +0100
@@ -27,7 +27,7 @@
#include <lemon/arg_parser.h>
using namespace lemon;
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
{
// Initialize the argument parser
ArgParser ap(argc, argv);
diff -r de38fca76780 -r 12626fc94ccf demo/graph_to_eps_demo.cc
--- a/demo/graph_to_eps_demo.cc Thu Oct 09 13:52:01 2008 +0100
+++ b/demo/graph_to_eps_demo.cc Thu Oct 09 14:37:44 2008 +0100
@@ -26,7 +26,7 @@
/// graphToEps(), and showing how to draw directed graphs,
/// how to handle parallel egdes, how to change the properties (like
/// color, shape, size, title etc.) of nodes and arcs individually
-/// using appropriate \ref maps-page "graph maps".
+/// using appropriate graph maps.
///
/// \include graph_to_eps_demo.cc
diff -r de38fca76780 -r 12626fc94ccf doc/Makefile.am
--- a/doc/Makefile.am Thu Oct 09 13:52:01 2008 +0100
+++ b/doc/Makefile.am Thu Oct 09 14:37:44 2008 +0100
@@ -6,6 +6,7 @@
doc/lgf.dox \
doc/license.dox \
doc/mainpage.dox \
+ doc/migration.dox \
doc/named-param.dox \
doc/namespaces.dox \
doc/html \
diff -r de38fca76780 -r 12626fc94ccf doc/groups.dox
--- a/doc/groups.dox Thu Oct 09 13:52:01 2008 +0100
+++ b/doc/groups.dox Thu Oct 09 14:37:44 2008 +0100
@@ -42,7 +42,9 @@
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 structure.
+
+<b>See also:</b> \ref graph_concepts "Graph Structure Concepts".
*/
/**
@@ -52,8 +54,10 @@
This group describes the map structures implemented in LEMON.
-LEMON provides several special purpose maps that e.g. combine
+LEMON provides several special purpose maps and map adaptors that e.g. combine
new maps from existing ones.
+
+<b>See also:</b> \ref map_concepts "Map Concepts".
*/
/**
@@ -64,7 +68,6 @@
This group describes maps that are specifically designed to assign
values to the nodes and arcs of graphs.
*/
-
/**
\defgroup map_adaptors Map Adaptors
@@ -82,7 +85,7 @@
The typical usage of this classes is passing implicit maps to
algorithms. If a function type algorithm is called then the function
type map adaptors can be used comfortable. For example let's see the
-usage of map adaptors with the \c digraphToEps() function.
+usage of map adaptors with the \c graphToEps() function.
\code
Color nodeColor(int deg) {
if (deg >= 2) {
@@ -96,13 +99,13 @@
Digraph::NodeMap<int> degree_map(graph);
- digraphToEps(graph, "graph.eps")
+ graphToEps(graph, "graph.eps")
.coords(coords).scaleToA4().undirected()
.nodeColors(composeMap(functorToMap(nodeColor), degree_map))
.run();
\endcode
The \c functorToMap() function makes an \c int to \c Color map from the
-\e nodeColor() function. The \c composeMap() compose the \e degree_map
+\c nodeColor() function. The \c composeMap() compose the \c degree_map
and the previously created map. The composed map is a proper function to
get the color of each node.
@@ -143,7 +146,6 @@
any kind of path structure.
\sa lemon::concepts::Path
-
*/
/**
@@ -154,7 +156,6 @@
This group describes some data structures implemented in LEMON in
order to make it easier to implement combinatorial algorithms.
*/
-
/**
@defgroup algs Algorithms
@@ -171,11 +172,11 @@
\brief Common graph search algorithms.
This group describes the common graph search algorithms like
-Breadth-first search (Bfs) and Depth-first search (Dfs).
+Breadth-First Search (BFS) and Depth-First Search (DFS).
*/
/**
- at defgroup shortest_path Shortest Path algorithms
+ at defgroup shortest_path Shortest Path Algorithms
@ingroup algs
\brief Algorithms for finding shortest paths.
@@ -183,7 +184,7 @@
*/
/**
- at defgroup spantree Minimum Spanning Tree algorithms
+ at defgroup spantree Minimum Spanning Tree Algorithms
@ingroup algs
\brief Algorithms for finding a minimum cost spanning tree in a graph.
@@ -191,6 +192,7 @@
tree in a graph
*/
+ at ingroup algs
/**
@defgroup utils Tools and Utilities
\brief Tools and utilities for programming in LEMON
@@ -216,7 +218,7 @@
*/
/**
- at defgroup timecount Time measuring and Counting
+ at defgroup timecount Time Measuring and Counting
@ingroup misc
\brief Simple tools for measuring the performance of algorithms.
@@ -239,26 +241,26 @@
This group describes the tools for importing and exporting graphs
and graph related data. Now it supports the LEMON format
and the encapsulated postscript (EPS) format.
+postscript (EPS) format.
*/
/**
@defgroup lemon_io LEMON Input-Output
@ingroup io_group
-\brief Reading and writing \ref lgf-format "LEMON Graph Format".
+\brief Reading and writing LEMON Graph Format.
This group describes methods for reading and writing
\ref lgf-format "LEMON Graph Format".
*/
/**
- at defgroup eps_io Postscript exporting
+ at defgroup eps_io Postscript Exporting
@ingroup io_group
\brief General \c EPS drawer and graph exporter
This group describes general \c EPS drawing methods and special
graph exporting tools.
*/
-
/**
@defgroup concept Concepts
@@ -287,9 +289,7 @@
concept indeed provides all the required features.
- Finally, They can serve as a skeleton of a new implementation of a concept.
-
*/
-
/**
@defgroup graph_concepts Graph Structure Concepts
@@ -300,6 +300,8 @@
graph structures and helper classes used to implement these.
*/
+
+This group describes the skeletons and concept checking classes of maps.
/**
\anchor demoprograms
diff -r de38fca76780 -r 12626fc94ccf doc/lgf.dox
--- a/doc/lgf.dox Thu Oct 09 13:52:01 2008 +0100
+++ b/doc/lgf.dox Thu Oct 09 14:37:44 2008 +0100
@@ -78,7 +78,7 @@
2 3 18
\endcode
-The \c \@edges is just a synonym of \c \@arcs. The @arcs section can
+The \c \@edges is just a synonym of \c \@arcs. The \@arcs section can
also store the edge set of an undirected graph. In such case there is
a conventional method for store arc maps in the file, if two columns
has the same caption with \c '+' and \c '-' prefix, then these columns
diff -r de38fca76780 -r 12626fc94ccf doc/mainpage.dox
--- a/doc/mainpage.dox Thu Oct 09 13:52:01 2008 +0100
+++ b/doc/mainpage.dox Thu Oct 09 14:37:44 2008 +0100
@@ -43,11 +43,12 @@
If you
want to see how LEMON works, see
-some \ref demoprograms "demo programs"!
+some \ref demoprograms "demo programs".
If you know what you are looking for then try to find it under the
<a class="el" href="modules.html">Modules</a>
section.
More information about the Lemon-commits
mailing list