# HG changeset patch # User Alpar Juttner # Date 1217336490 -7200 # Node ID bea328c5a8d31c823023554dfe6f3b06db520882 # Parent 7b7e3f20bcec60a51492e8b036738c16bf645448# Parent da953e387d31b09feb8008172fd2aa318db62d89 Merge diff -r 7b7e3f20bcec -r bea328c5a8d3 CMakeLists.txt --- a/CMakeLists.txt Tue Jul 29 14:54:08 2008 +0200 +++ b/CMakeLists.txt Tue Jul 29 15:01:30 2008 +0200 @@ -5,7 +5,7 @@ # OUTPUT_VARIABLE HG_REVISION # OUTPUT_STRIP_TRAILING_WHITESPACE) -SET(PROJECT_NAME "Lemon") +SET(PROJECT_NAME "LEMON") SET(PROJECT_VERSION_MAJOR "0") SET(PROJECT_VERSION_MINOR "99") SET(PROJECT_VERSION_PATCH "0") @@ -36,7 +36,7 @@ SET(CPACK_PACKAGE_VENDOR "EGRES - Egervary Research Group on Combinatorial Optimization") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY - "Lemon - Library of Efficient Models and Optimization in Networks") + "LEMON - Library of Efficient Models and Optimization in Networks") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) @@ -57,9 +57,9 @@ #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation") #SET(CPACK_COMPONENT_HEADERS_DESCRIPTION - # "C++ header files for use with the Lemon library") + # "C++ header files for use with the LEMON library") #SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION - # "Static library used to build programs with Lemon") + # "Static library used to build programs with LEMON") #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION # "Doxygen generated documentation") @@ -70,9 +70,9 @@ #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation") #SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION - # "Components needed to develop software using Lemon") + # "Components needed to develop software using LEMON") #SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION - # "Documentation of Lemon") + # "Documentation of LEMON") #SET(CPACK_ALL_INSTALL_TYPES Full Developer) diff -r 7b7e3f20bcec -r bea328c5a8d3 configure.ac --- a/configure.ac Tue Jul 29 14:54:08 2008 +0200 +++ b/configure.ac Tue Jul 29 15:01:30 2008 +0200 @@ -6,7 +6,7 @@ m4_define([lemon_version], [ifelse(lemon_version_number(), [], [lemon_hg_revision()], [lemon_version_number()])]) AC_PREREQ([2.59]) -AC_INIT([Lemon], [lemon_version()], [lemon-user@lemon.cs.elte.hu], [lemon]) +AC_INIT([LEMON], [lemon_version()], [lemon-user@lemon.cs.elte.hu], [lemon]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc]) diff -r 7b7e3f20bcec -r bea328c5a8d3 doc/groups.dox --- a/doc/groups.dox Tue Jul 29 14:54:08 2008 +0200 +++ b/doc/groups.dox Tue Jul 29 15:01:30 2008 +0200 @@ -325,7 +325,7 @@ matching. The search can be constrained to find perfect or maximum cardinality matching. -Lemon contains the next algorithms: +LEMON contains the next algorithms: - \ref lemon::MaxBipartiteMatching "MaxBipartiteMatching" Hopcroft-Karp augmenting path algorithm for calculate maximum cardinality matching in bipartite graphs @@ -476,12 +476,12 @@ */ /** -@defgroup lemon_io Lemon Input-Output +@defgroup lemon_io LEMON Input-Output @ingroup io_group -\brief Reading and writing \ref lgf-format "Lemon Graph Format". +\brief Reading and writing \ref lgf-format "LEMON Graph Format". This group describes methods for reading and writing -\ref lgf-format "Lemon Graph Format". +\ref lgf-format "LEMON Graph Format". */ /** diff -r 7b7e3f20bcec -r bea328c5a8d3 doc/lgf.dox --- a/doc/lgf.dox Tue Jul 29 14:54:08 2008 +0200 +++ b/doc/lgf.dox Tue Jul 29 15:01:30 2008 +0200 @@ -21,7 +21,7 @@ -\page lgf-format Lemon Graph Format (LGF) +\page lgf-format LEMON Graph Format (LGF) The \e LGF is a column oriented file format for storing graphs and associated data like diff -r 7b7e3f20bcec -r bea328c5a8d3 lemon/bits/alteration_notifier.h --- a/lemon/bits/alteration_notifier.h Tue Jul 29 14:54:08 2008 +0200 +++ b/lemon/bits/alteration_notifier.h Tue Jul 29 15:01:30 2008 +0200 @@ -41,7 +41,7 @@ /// value containers which are the node and edge maps. /// /// The graph's node and edge sets can be changed as we add or erase - /// nodes and edges in the graph. Lemon would like to handle easily + /// nodes and edges in the graph. LEMON would like to handle easily /// that the node and edge maps should contain values for all nodes or /// edges. If we want to check on every indicing if the map contains /// the current indicing key that cause a drawback in the performance diff -r 7b7e3f20bcec -r bea328c5a8d3 lemon/concepts/path.h --- a/lemon/concepts/path.h Tue Jul 29 14:54:08 2008 +0200 +++ b/lemon/concepts/path.h Tue Jul 29 15:01:30 2008 +0200 @@ -77,7 +77,7 @@ /// Resets the path to an empty path. void clear() {} - /// \brief Lemon style iterator for path arcs + /// \brief LEMON style iterator for path arcs /// /// This class is used to iterate on the arcs of the paths. class ArcIt { @@ -200,7 +200,7 @@ /// algorithms can enumerate easily the arcs in reverse order. /// If we would like to give back a real path from these /// algorithms then we should create a temporarly path object. In - /// Lemon such algorithms gives back a path dumper what can + /// LEMON such algorithms gives back a path dumper what can /// assigned to a real path and the dumpers can be implemented as /// an adaptor class to the predecessor map. @@ -232,7 +232,7 @@ /// dumper. typedef False RevPathTag; - /// \brief Lemon style iterator for path arcs + /// \brief LEMON style iterator for path arcs /// /// This class is used to iterate on the arcs of the paths. class ArcIt { @@ -259,7 +259,7 @@ }; - /// \brief Lemon style iterator for path arcs + /// \brief LEMON style iterator for path arcs /// /// This class is used to iterate on the arcs of the paths in /// reverse direction. diff -r 7b7e3f20bcec -r bea328c5a8d3 lemon/lgf_reader.h --- a/lemon/lgf_reader.h Tue Jul 29 14:54:08 2008 +0200 +++ b/lemon/lgf_reader.h Tue Jul 29 15:01:30 2008 +0200 @@ -18,7 +18,7 @@ ///\ingroup lemon_io ///\file -///\brief \ref lgf-format "Lemon Graph Format" reader. +///\brief \ref lgf-format "LEMON Graph Format" reader. #ifndef LEMON_LGF_READER_H @@ -2301,7 +2301,7 @@ /// \brief Reader for the contents of the \ref lgf-format "LGF" file /// /// This class can be used to read the sections, the map names and - /// the attributes from a file. Usually, the Lemon programs know + /// the attributes from a file. Usually, the LEMON programs know /// that, which type of graph, which maps and which attributes /// should be read from a file, but in general tools (like glemon) /// the contents of an LGF file should be guessed somehow. This class diff -r 7b7e3f20bcec -r bea328c5a8d3 lemon/lgf_writer.h --- a/lemon/lgf_writer.h Tue Jul 29 14:54:08 2008 +0200 +++ b/lemon/lgf_writer.h Tue Jul 29 15:01:30 2008 +0200 @@ -18,7 +18,7 @@ ///\ingroup lemon_io ///\file -///\brief \ref lgf-format "Lemon Graph Format" writer. +///\brief \ref lgf-format "LEMON Graph Format" writer. #ifndef LEMON_LGF_WRITER_H diff -r 7b7e3f20bcec -r bea328c5a8d3 lemon/path.h --- a/lemon/path.h Tue Jul 29 14:54:08 2008 +0200 +++ b/lemon/path.h Tue Jul 29 15:01:30 2008 +0200 @@ -82,7 +82,7 @@ return *this; } - /// \brief Lemon style iterator for path arcs + /// \brief LEMON style iterator for path arcs /// /// This class is used to iterate on the arcs of the paths. class ArcIt { diff -r 7b7e3f20bcec -r bea328c5a8d3 lemon/unionfind.h --- a/lemon/unionfind.h Tue Jul 29 14:54:08 2008 +0200 +++ b/lemon/unionfind.h Tue Jul 29 15:01:30 2008 +0200 @@ -497,7 +497,7 @@ firstFreeItem = fdx; } - /// \brief Lemon style iterator for the representant items. + /// \brief LEMON style iterator for the representant items. /// /// ClassIt is a lemon style iterator for the components. It iterates /// on the ids of the classes. @@ -549,7 +549,7 @@ int cdx; }; - /// \brief Lemon style iterator for the items of a component. + /// \brief LEMON style iterator for the items of a component. /// /// ClassIt is a lemon style iterator for the components. It iterates /// on the items of a class. By example if you want to iterate on @@ -807,7 +807,7 @@ firstFreeClass = cdx; } - /// \brief Lemon style iterator for the classes. + /// \brief LEMON style iterator for the classes. /// /// ClassIt is a lemon style iterator for the components. It iterates /// on the ids of classes. @@ -859,7 +859,7 @@ int cdx; }; - /// \brief Lemon style iterator for the items of a component. + /// \brief LEMON style iterator for the items of a component. /// /// ClassIt is a lemon style iterator for the components. It iterates /// on the items of a class. By example if you want to iterate on @@ -1655,7 +1655,7 @@ return nodes[parent >= 0 ? classes[id].depth : leftNode(id)].item; } - /// \brief Lemon style iterator for the items of a class. + /// \brief LEMON style iterator for the items of a class. /// /// ClassIt is a lemon style iterator for the components. It iterates /// on the items of a class. By example if you want to iterate on