[Lemon-commits] Alpar Juttner: Merge

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/4d3d1a2cd23d
changeset: 705:4d3d1a2cd23d
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Mon May 11 16:38:21 2009 +0100
description:
	Merge

diffstat:

 CMakeLists.txt    |   2 +-
 README            |   6 +++---
 doc/groups.dox    |  10 ----------
 doc/mainpage.dox  |   3 +--
 lemon/edge_set.h  |  10 +++++-----
 lemon/lemon.pc.in |   2 +-
 6 files changed, 11 insertions(+), 22 deletions(-)

diffs (118 lines):

diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@
     SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
     SET(CPACK_PACKAGE_VENDOR "EGRES")
     SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
-      "LEMON - Library of Efficient Models and Optimization in Networks")
+      "LEMON - Library for Efficient Modeling and Optimization in Networks")
     SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 
     SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
-==================================================================
-LEMON - a Library of Efficient Models and Optimization in Networks
-==================================================================
+=====================================================================
+LEMON - a Library for Efficient Modeling and Optimization in Networks
+=====================================================================
 
 LEMON is an open source library written in C++. It provides
 easy-to-use implementations of common data structures and algorithms
diff --git a/doc/groups.dox b/doc/groups.dox
--- a/doc/groups.dox
+++ b/doc/groups.dox
@@ -138,16 +138,6 @@
 */
 
 /**
- at defgroup semi_adaptors Semi-Adaptor Classes for Graphs
- at ingroup graphs
-\brief Graph types between real graphs and graph adaptors.
-
-This group contains some graph types between real graphs and graph adaptors.
-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.
-*/
-
-/**
 @defgroup maps Maps
 @ingroup datas
 \brief Map structures implemented in LEMON.
diff --git a/doc/mainpage.dox b/doc/mainpage.dox
--- a/doc/mainpage.dox
+++ b/doc/mainpage.dox
@@ -23,8 +23,7 @@
 
 \subsection whatis What is LEMON
 
-LEMON stands for
-<b>L</b>ibrary of <b>E</b>fficient <b>M</b>odels
+LEMON stands for <b>L</b>ibrary for <b>E</b>fficient <b>M</b>odeling
 and <b>O</b>ptimization in <b>N</b>etworks.
 It is a C++ template
 library aimed at combinatorial optimization tasks which
diff --git a/lemon/edge_set.h b/lemon/edge_set.h
--- a/lemon/edge_set.h
+++ b/lemon/edge_set.h
@@ -22,7 +22,7 @@
 #include <lemon/core.h>
 #include <lemon/bits/edge_set_extender.h>
 
-/// \ingroup semi_adaptors
+/// \ingroup graphs
 /// \file
 /// \brief ArcSet and EdgeSet classes.
 ///
@@ -230,7 +230,7 @@
 
   };
 
-  /// \ingroup semi_adaptors
+  /// \ingroup graphs
   ///
   /// \brief Digraph using a node set of another digraph or graph and
   /// an own arc set.
@@ -654,7 +654,7 @@
 
   };
 
-  /// \ingroup semi_adaptors
+  /// \ingroup graphs
   ///
   /// \brief Graph using a node set of another digraph or graph and an
   /// own edge set.
@@ -913,7 +913,7 @@
   };
 
 
-  /// \ingroup semi_adaptors
+  /// \ingroup graphs
   ///
   /// \brief Digraph using a node set of another digraph or graph and
   /// an own arc set.
@@ -1257,7 +1257,7 @@
 
   };
 
-  /// \ingroup semi_adaptors
+  /// \ingroup graphs
   ///
   /// \brief Graph using a node set of another digraph or graph and an
   /// own edge set.
diff --git a/lemon/lemon.pc.in b/lemon/lemon.pc.in
--- a/lemon/lemon.pc.in
+++ b/lemon/lemon.pc.in
@@ -4,7 +4,7 @@
 includedir=@includedir@
 
 Name: @PACKAGE_NAME@
-Description: Library of Efficient Models and Optimization in Networks
+Description: Library for Efficient Modeling and Optimization in Networks
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@ @SOPLEX_LIBS@ @CLP_LIBS@ @CBC_LIBS@
 Cflags: -I${includedir}