1.1 --- a/CMakeLists.txt Tue Jul 29 14:41:55 2008 +0200
1.2 +++ b/CMakeLists.txt Tue Jul 29 15:06:37 2008 +0200
1.3 @@ -5,7 +5,7 @@
1.4 # OUTPUT_VARIABLE HG_REVISION
1.5 # OUTPUT_STRIP_TRAILING_WHITESPACE)
1.6
1.7 -SET(PROJECT_NAME "Lemon")
1.8 +SET(PROJECT_NAME "LEMON")
1.9 SET(PROJECT_VERSION_MAJOR "0")
1.10 SET(PROJECT_VERSION_MINOR "99")
1.11 SET(PROJECT_VERSION_PATCH "0")
1.12 @@ -36,7 +36,7 @@
1.13 SET(CPACK_PACKAGE_VENDOR
1.14 "EGRES - Egervary Research Group on Combinatorial Optimization")
1.15 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
1.16 - "Lemon - Library of Efficient Models and Optimization in Networks")
1.17 + "LEMON - Library of Efficient Models and Optimization in Networks")
1.18 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
1.19
1.20 SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
1.21 @@ -57,9 +57,9 @@
1.22 #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
1.23
1.24 #SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
1.25 - # "C++ header files for use with the Lemon library")
1.26 + # "C++ header files for use with the LEMON library")
1.27 #SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
1.28 - # "Static library used to build programs with Lemon")
1.29 + # "Static library used to build programs with LEMON")
1.30 #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
1.31 # "Doxygen generated documentation")
1.32
1.33 @@ -70,9 +70,9 @@
1.34 #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
1.35
1.36 #SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
1.37 - # "Components needed to develop software using Lemon")
1.38 + # "Components needed to develop software using LEMON")
1.39 #SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
1.40 - # "Documentation of Lemon")
1.41 + # "Documentation of LEMON")
1.42
1.43 #SET(CPACK_ALL_INSTALL_TYPES Full Developer)
1.44
2.1 --- a/configure.ac Tue Jul 29 14:41:55 2008 +0200
2.2 +++ b/configure.ac Tue Jul 29 15:06:37 2008 +0200
2.3 @@ -6,7 +6,7 @@
2.4 m4_define([lemon_version], [ifelse(lemon_version_number(), [], [lemon_hg_revision()], [lemon_version_number()])])
2.5
2.6 AC_PREREQ([2.59])
2.7 -AC_INIT([Lemon], [lemon_version()], [lemon-user@lemon.cs.elte.hu], [lemon])
2.8 +AC_INIT([LEMON], [lemon_version()], [lemon-user@lemon.cs.elte.hu], [lemon])
2.9 AC_CONFIG_AUX_DIR([build-aux])
2.10 AC_CONFIG_MACRO_DIR([m4])
2.11 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc])
3.1 --- a/doc/groups.dox Tue Jul 29 14:41:55 2008 +0200
3.2 +++ b/doc/groups.dox Tue Jul 29 15:06:37 2008 +0200
3.3 @@ -325,7 +325,7 @@
3.4 matching. The search can be constrained to find perfect or
3.5 maximum cardinality matching.
3.6
3.7 -Lemon contains the next algorithms:
3.8 +LEMON contains the next algorithms:
3.9 - \ref lemon::MaxBipartiteMatching "MaxBipartiteMatching" Hopcroft-Karp
3.10 augmenting path algorithm for calculate maximum cardinality matching in
3.11 bipartite graphs
3.12 @@ -476,12 +476,12 @@
3.13 */
3.14
3.15 /**
3.16 -@defgroup lemon_io Lemon Input-Output
3.17 +@defgroup lemon_io LEMON Input-Output
3.18 @ingroup io_group
3.19 -\brief Reading and writing \ref lgf-format "Lemon Graph Format".
3.20 +\brief Reading and writing \ref lgf-format "LEMON Graph Format".
3.21
3.22 This group describes methods for reading and writing
3.23 -\ref lgf-format "Lemon Graph Format".
3.24 +\ref lgf-format "LEMON Graph Format".
3.25 */
3.26
3.27 /**
4.1 --- a/doc/lgf.dox Tue Jul 29 14:41:55 2008 +0200
4.2 +++ b/doc/lgf.dox Tue Jul 29 15:06:37 2008 +0200
4.3 @@ -21,7 +21,7 @@
4.4
4.5
4.6
4.7 -\page lgf-format Lemon Graph Format (LGF)
4.8 +\page lgf-format LEMON Graph Format (LGF)
4.9
4.10 The \e LGF is a <em>column oriented</em>
4.11 file format for storing graphs and associated data like
5.1 --- a/lemon/bits/alteration_notifier.h Tue Jul 29 14:41:55 2008 +0200
5.2 +++ b/lemon/bits/alteration_notifier.h Tue Jul 29 15:06:37 2008 +0200
5.3 @@ -41,7 +41,7 @@
5.4 /// value containers which are the node and edge maps.
5.5 ///
5.6 /// The graph's node and edge sets can be changed as we add or erase
5.7 - /// nodes and edges in the graph. Lemon would like to handle easily
5.8 + /// nodes and edges in the graph. LEMON would like to handle easily
5.9 /// that the node and edge maps should contain values for all nodes or
5.10 /// edges. If we want to check on every indicing if the map contains
5.11 /// the current indicing key that cause a drawback in the performance
6.1 --- a/lemon/concepts/path.h Tue Jul 29 14:41:55 2008 +0200
6.2 +++ b/lemon/concepts/path.h Tue Jul 29 15:06:37 2008 +0200
6.3 @@ -77,7 +77,7 @@
6.4 /// Resets the path to an empty path.
6.5 void clear() {}
6.6
6.7 - /// \brief Lemon style iterator for path arcs
6.8 + /// \brief LEMON style iterator for path arcs
6.9 ///
6.10 /// This class is used to iterate on the arcs of the paths.
6.11 class ArcIt {
6.12 @@ -200,7 +200,7 @@
6.13 /// algorithms can enumerate easily the arcs in reverse order.
6.14 /// If we would like to give back a real path from these
6.15 /// algorithms then we should create a temporarly path object. In
6.16 - /// Lemon such algorithms gives back a path dumper what can
6.17 + /// LEMON such algorithms gives back a path dumper what can
6.18 /// assigned to a real path and the dumpers can be implemented as
6.19 /// an adaptor class to the predecessor map.
6.20
6.21 @@ -232,7 +232,7 @@
6.22 /// dumper.
6.23 typedef False RevPathTag;
6.24
6.25 - /// \brief Lemon style iterator for path arcs
6.26 + /// \brief LEMON style iterator for path arcs
6.27 ///
6.28 /// This class is used to iterate on the arcs of the paths.
6.29 class ArcIt {
6.30 @@ -259,7 +259,7 @@
6.31
6.32 };
6.33
6.34 - /// \brief Lemon style iterator for path arcs
6.35 + /// \brief LEMON style iterator for path arcs
6.36 ///
6.37 /// This class is used to iterate on the arcs of the paths in
6.38 /// reverse direction.
7.1 --- a/lemon/lgf_reader.h Tue Jul 29 14:41:55 2008 +0200
7.2 +++ b/lemon/lgf_reader.h Tue Jul 29 15:06:37 2008 +0200
7.3 @@ -18,7 +18,7 @@
7.4
7.5 ///\ingroup lemon_io
7.6 ///\file
7.7 -///\brief \ref lgf-format "Lemon Graph Format" reader.
7.8 +///\brief \ref lgf-format "LEMON Graph Format" reader.
7.9
7.10
7.11 #ifndef LEMON_LGF_READER_H
7.12 @@ -2301,7 +2301,7 @@
7.13 /// \brief Reader for the contents of the \ref lgf-format "LGF" file
7.14 ///
7.15 /// This class can be used to read the sections, the map names and
7.16 - /// the attributes from a file. Usually, the Lemon programs know
7.17 + /// the attributes from a file. Usually, the LEMON programs know
7.18 /// that, which type of graph, which maps and which attributes
7.19 /// should be read from a file, but in general tools (like glemon)
7.20 /// the contents of an LGF file should be guessed somehow. This class
8.1 --- a/lemon/lgf_writer.h Tue Jul 29 14:41:55 2008 +0200
8.2 +++ b/lemon/lgf_writer.h Tue Jul 29 15:06:37 2008 +0200
8.3 @@ -18,7 +18,7 @@
8.4
8.5 ///\ingroup lemon_io
8.6 ///\file
8.7 -///\brief \ref lgf-format "Lemon Graph Format" writer.
8.8 +///\brief \ref lgf-format "LEMON Graph Format" writer.
8.9
8.10
8.11 #ifndef LEMON_LGF_WRITER_H
8.12 @@ -934,7 +934,7 @@
8.13 std::ostream* _os;
8.14 bool local_os;
8.15
8.16 - Graph& _graph;
8.17 + const Graph& _graph;
8.18
8.19 std::string _nodes_caption;
8.20 std::string _edges_caption;
9.1 --- a/lemon/list_graph.h Tue Jul 29 14:41:55 2008 +0200
9.2 +++ b/lemon/list_graph.h Tue Jul 29 15:06:37 2008 +0200
9.3 @@ -842,7 +842,9 @@
9.4 explicit Arc(int pid) { id = pid;}
9.5
9.6 public:
9.7 - operator Edge() const { return edgeFromId(id / 2); }
9.8 + operator Edge() const {
9.9 + return id != -1 ? edgeFromId(id / 2) : INVALID;
9.10 + }
9.11
9.12 Arc() {}
9.13 Arc (Invalid) { id = -1; }
10.1 --- a/lemon/path.h Tue Jul 29 14:41:55 2008 +0200
10.2 +++ b/lemon/path.h Tue Jul 29 15:06:37 2008 +0200
10.3 @@ -82,7 +82,7 @@
10.4 return *this;
10.5 }
10.6
10.7 - /// \brief Lemon style iterator for path arcs
10.8 + /// \brief LEMON style iterator for path arcs
10.9 ///
10.10 /// This class is used to iterate on the arcs of the paths.
10.11 class ArcIt {
11.1 --- a/lemon/smart_graph.h Tue Jul 29 14:41:55 2008 +0200
11.2 +++ b/lemon/smart_graph.h Tue Jul 29 15:06:37 2008 +0200
11.3 @@ -465,7 +465,9 @@
11.4 explicit Arc(int id) { _id = id;}
11.5
11.6 public:
11.7 - operator Edge() const { return edgeFromId(_id / 2); }
11.8 + operator Edge() const {
11.9 + return _id != -1 ? edgeFromId(_id / 2) : INVALID;
11.10 + }
11.11
11.12 Arc() {}
11.13 Arc (Invalid) { _id = -1; }
12.1 --- a/lemon/unionfind.h Tue Jul 29 14:41:55 2008 +0200
12.2 +++ b/lemon/unionfind.h Tue Jul 29 15:06:37 2008 +0200
12.3 @@ -497,7 +497,7 @@
12.4 firstFreeItem = fdx;
12.5 }
12.6
12.7 - /// \brief Lemon style iterator for the representant items.
12.8 + /// \brief LEMON style iterator for the representant items.
12.9 ///
12.10 /// ClassIt is a lemon style iterator for the components. It iterates
12.11 /// on the ids of the classes.
12.12 @@ -549,7 +549,7 @@
12.13 int cdx;
12.14 };
12.15
12.16 - /// \brief Lemon style iterator for the items of a component.
12.17 + /// \brief LEMON style iterator for the items of a component.
12.18 ///
12.19 /// ClassIt is a lemon style iterator for the components. It iterates
12.20 /// on the items of a class. By example if you want to iterate on
12.21 @@ -807,7 +807,7 @@
12.22 firstFreeClass = cdx;
12.23 }
12.24
12.25 - /// \brief Lemon style iterator for the classes.
12.26 + /// \brief LEMON style iterator for the classes.
12.27 ///
12.28 /// ClassIt is a lemon style iterator for the components. It iterates
12.29 /// on the ids of classes.
12.30 @@ -859,7 +859,7 @@
12.31 int cdx;
12.32 };
12.33
12.34 - /// \brief Lemon style iterator for the items of a component.
12.35 + /// \brief LEMON style iterator for the items of a component.
12.36 ///
12.37 /// ClassIt is a lemon style iterator for the components. It iterates
12.38 /// on the items of a class. By example if you want to iterate on
12.39 @@ -1655,7 +1655,7 @@
12.40 return nodes[parent >= 0 ? classes[id].depth : leftNode(id)].item;
12.41 }
12.42
12.43 - /// \brief Lemon style iterator for the items of a class.
12.44 + /// \brief LEMON style iterator for the items of a class.
12.45 ///
12.46 /// ClassIt is a lemon style iterator for the components. It iterates
12.47 /// on the items of a class. By example if you want to iterate on