Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Mon, 11 May 2009 16:38:21 +0100
changeset 6604d3d1a2cd23d
parent 659 ca92c2f936b0
parent 658 d9cf3b5858ae
child 661 8b0df68370a4
Merge
     1.1 --- a/CMakeLists.txt	Sat May 09 16:47:26 2009 +0200
     1.2 +++ b/CMakeLists.txt	Mon May 11 16:38:21 2009 +0100
     1.3 @@ -44,7 +44,7 @@
     1.4      SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
     1.5      SET(CPACK_PACKAGE_VENDOR "EGRES")
     1.6      SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
     1.7 -      "LEMON - Library of Efficient Models and Optimization in Networks")
     1.8 +      "LEMON - Library for Efficient Modeling and Optimization in Networks")
     1.9      SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
    1.10  
    1.11      SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
     2.1 --- a/README	Sat May 09 16:47:26 2009 +0200
     2.2 +++ b/README	Mon May 11 16:38:21 2009 +0100
     2.3 @@ -1,6 +1,6 @@
     2.4 -==================================================================
     2.5 -LEMON - a Library of Efficient Models and Optimization in Networks
     2.6 -==================================================================
     2.7 +=====================================================================
     2.8 +LEMON - a Library for Efficient Modeling and Optimization in Networks
     2.9 +=====================================================================
    2.10  
    2.11  LEMON is an open source library written in C++. It provides
    2.12  easy-to-use implementations of common data structures and algorithms
     3.1 --- a/doc/groups.dox	Sat May 09 16:47:26 2009 +0200
     3.2 +++ b/doc/groups.dox	Mon May 11 16:38:21 2009 +0100
     3.3 @@ -138,16 +138,6 @@
     3.4  */
     3.5  
     3.6  /**
     3.7 -@defgroup semi_adaptors Semi-Adaptor Classes for Graphs
     3.8 -@ingroup graphs
     3.9 -\brief Graph types between real graphs and graph adaptors.
    3.10 -
    3.11 -This group contains some graph types between real graphs and graph adaptors.
    3.12 -These classes wrap graphs to give new functionality as the adaptors do it.
    3.13 -On the other hand they are not light-weight structures as the adaptors.
    3.14 -*/
    3.15 -
    3.16 -/**
    3.17  @defgroup maps Maps
    3.18  @ingroup datas
    3.19  \brief Map structures implemented in LEMON.
     4.1 --- a/doc/mainpage.dox	Sat May 09 16:47:26 2009 +0200
     4.2 +++ b/doc/mainpage.dox	Mon May 11 16:38:21 2009 +0100
     4.3 @@ -23,8 +23,7 @@
     4.4  
     4.5  \subsection whatis What is LEMON
     4.6  
     4.7 -LEMON stands for
     4.8 -<b>L</b>ibrary of <b>E</b>fficient <b>M</b>odels
     4.9 +LEMON stands for <b>L</b>ibrary for <b>E</b>fficient <b>M</b>odeling
    4.10  and <b>O</b>ptimization in <b>N</b>etworks.
    4.11  It is a C++ template
    4.12  library aimed at combinatorial optimization tasks which
     5.1 --- a/lemon/edge_set.h	Sat May 09 16:47:26 2009 +0200
     5.2 +++ b/lemon/edge_set.h	Mon May 11 16:38:21 2009 +0100
     5.3 @@ -22,7 +22,7 @@
     5.4  #include <lemon/core.h>
     5.5  #include <lemon/bits/edge_set_extender.h>
     5.6  
     5.7 -/// \ingroup semi_adaptors
     5.8 +/// \ingroup graphs
     5.9  /// \file
    5.10  /// \brief ArcSet and EdgeSet classes.
    5.11  ///
    5.12 @@ -230,7 +230,7 @@
    5.13  
    5.14    };
    5.15  
    5.16 -  /// \ingroup semi_adaptors
    5.17 +  /// \ingroup graphs
    5.18    ///
    5.19    /// \brief Digraph using a node set of another digraph or graph and
    5.20    /// an own arc set.
    5.21 @@ -654,7 +654,7 @@
    5.22  
    5.23    };
    5.24  
    5.25 -  /// \ingroup semi_adaptors
    5.26 +  /// \ingroup graphs
    5.27    ///
    5.28    /// \brief Graph using a node set of another digraph or graph and an
    5.29    /// own edge set.
    5.30 @@ -913,7 +913,7 @@
    5.31    };
    5.32  
    5.33  
    5.34 -  /// \ingroup semi_adaptors
    5.35 +  /// \ingroup graphs
    5.36    ///
    5.37    /// \brief Digraph using a node set of another digraph or graph and
    5.38    /// an own arc set.
    5.39 @@ -1257,7 +1257,7 @@
    5.40  
    5.41    };
    5.42  
    5.43 -  /// \ingroup semi_adaptors
    5.44 +  /// \ingroup graphs
    5.45    ///
    5.46    /// \brief Graph using a node set of another digraph or graph and an
    5.47    /// own edge set.
     6.1 --- a/lemon/lemon.pc.in	Sat May 09 16:47:26 2009 +0200
     6.2 +++ b/lemon/lemon.pc.in	Mon May 11 16:38:21 2009 +0100
     6.3 @@ -4,7 +4,7 @@
     6.4  includedir=@includedir@
     6.5  
     6.6  Name: @PACKAGE_NAME@
     6.7 -Description: Library of Efficient Models and Optimization in Networks
     6.8 +Description: Library for Efficient Modeling and Optimization in Networks
     6.9  Version: @PACKAGE_VERSION@
    6.10  Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@ @SOPLEX_LIBS@ @CLP_LIBS@ @CBC_LIBS@
    6.11  Cflags: -I${includedir}