Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revision 631)
+++ CMakeLists.txt (revision 658)
@@ -45,5 +45,5 @@
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")
Index: README
===================================================================
--- README (revision 318)
+++ README (revision 658)
@@ -1,5 +1,5 @@
-==================================================================
-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
Index: doc/mainpage.dox
===================================================================
--- doc/mainpage.dox (revision 651)
+++ doc/mainpage.dox (revision 658)
@@ -24,6 +24,5 @@
\subsection whatis What is LEMON
-LEMON stands for
-Library of Efficient Models
+LEMON stands for Library for Efficient Modeling
and Optimization in Networks.
It is a C++ template
Index: lemon/concepts/graph.h
===================================================================
--- lemon/concepts/graph.h (revision 657)
+++ lemon/concepts/graph.h (revision 580)
@@ -311,6 +311,6 @@
/// The directed arc type. It can be converted to the
/// edge or it should be inherited from the undirected
- /// edge.
- class Arc {
+ /// arc.
+ class Arc : public Edge {
public:
/// Default constructor
@@ -323,5 +323,5 @@
/// Copy constructor.
///
- Arc(const Arc&) { }
+ Arc(const Arc& e) : Edge(e) { }
/// Initialize the iterator to be invalid.
@@ -350,6 +350,4 @@
bool operator<(Arc) const { return false; }
- /// Converison to Edge
- operator Edge() const { return Edge(); }
};
/// This iterator goes through each directed arc.
Index: lemon/lemon.pc.in
===================================================================
--- lemon/lemon.pc.in (revision 645)
+++ lemon/lemon.pc.in (revision 658)
@@ -5,5 +5,5 @@
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@