[Lemon-commits] Alpar Juttner: Merge
Lemon HG
hg at lemon.cs.elte.hu
Sun Mar 29 23:42:07 CEST 2009
details: http://lemon.cs.elte.hu/hg/lemon/rev/49a39bae067c
changeset: 590:49a39bae067c
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Sun Mar 29 22:19:14 2009 +0100
description:
Merge
diffstat:
CMakeLists.txt | 122 +++++++++++++++++++++-------------------
LICENSE | 11 +--
NEWS | 7 ++
demo/CMakeLists.txt | 6 +-
doc/CMakeLists.txt | 8 +-
lemon/CMakeLists.txt | 4 +-
lemon/Makefile.am | 1 +
lemon/cplex.cc | 14 ++--
lemon/cplex.h | 11 ++-
lemon/glpk.cc | 10 +-
scripts/unify-sources.sh | 7 ++-
test/CMakeLists.txt | 6 +-
test/counter_test.cc | 103 +++++++++++++++++++++------------
test/lp_test.cc | 6 +-
test/mip_test.cc | 6 +-
test/time_measure_test.cc | 10 +--
tools/CMakeLists.txt | 10 +-
tools/lemon-0.x-to-1.x.sh | 24 ++++---
18 files changed, 207 insertions(+), 159 deletions(-)
diffs (truncated from 735 to 300 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@
PROJECT(${PROJECT_NAME})
-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
INCLUDE(FindDoxygen)
INCLUDE(FindGhostscript)
@@ -38,74 +38,78 @@
ENABLE_TESTING()
ADD_SUBDIRECTORY(lemon)
-ADD_SUBDIRECTORY(demo)
-ADD_SUBDIRECTORY(tools)
-ADD_SUBDIRECTORY(doc)
-ADD_SUBDIRECTORY(test)
+IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
+ ADD_SUBDIRECTORY(demo)
+ ADD_SUBDIRECTORY(tools)
+ ADD_SUBDIRECTORY(doc)
+ ADD_SUBDIRECTORY(test)
+ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
-IF(WIN32)
- 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")
- SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
+ IF(WIN32)
+ 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")
+ SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
- SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+ SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
- SET(CPACK_PACKAGE_INSTALL_DIRECTORY
- "${PROJECT_NAME} ${PROJECT_VERSION}")
- SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
- "${PROJECT_NAME} ${PROJECT_VERSION}")
+ SET(CPACK_PACKAGE_INSTALL_DIRECTORY
+ "${PROJECT_NAME} ${PROJECT_VERSION}")
+ SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
+ "${PROJECT_NAME} ${PROJECT_VERSION}")
- SET(CPACK_COMPONENTS_ALL headers library html_documentation bin)
+ SET(CPACK_COMPONENTS_ALL headers library html_documentation bin)
- SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
- SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library")
- SET(CPACK_COMPONENT_BIN_DISPLAY_NAME "Command line utilities")
- SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
+ SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
+ SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library")
+ SET(CPACK_COMPONENT_BIN_DISPLAY_NAME "Command line utilities")
+ SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
- SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
- "C++ header files")
- SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
- "DLL and import library")
- SET(CPACK_COMPONENT_BIN_DESCRIPTION
- "Command line utilities")
- SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
- "Doxygen generated documentation")
+ SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
+ "C++ header files")
+ SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
+ "DLL and import library")
+ SET(CPACK_COMPONENT_BIN_DESCRIPTION
+ "Command line utilities")
+ SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
+ "Doxygen generated documentation")
- SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
+ SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
- SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
- SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
- SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
+ SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
+ SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
+ SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
- SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
- "Components needed to develop software using LEMON")
- SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
- "Documentation of LEMON")
+ SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
+ "Components needed to develop software using LEMON")
+ SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
+ "Documentation of LEMON")
- SET(CPACK_ALL_INSTALL_TYPES Full Developer)
+ SET(CPACK_ALL_INSTALL_TYPES Full Developer)
- SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
- SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
- SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
+ SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
+ SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
+ SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
- SET(CPACK_GENERATOR "NSIS")
- SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico")
- SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/cmake/nsis/uninstall.ico")
- #SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
- SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")
- SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")
- SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu")
- SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")
- SET(CPACK_NSIS_CONTACT "lemon-user at lemon.cs.elte.hu")
- SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
- CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\"
- ")
- SET(CPACK_NSIS_DELETE_ICONS_EXTRA "
- !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
- Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\"
- ")
+ SET(CPACK_GENERATOR "NSIS")
+ SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis/lemon.ico")
+ SET(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/cmake/nsis/uninstall.ico")
+ #SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
+ SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")
+ SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")
+ SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu")
+ SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")
+ SET(CPACK_NSIS_CONTACT "lemon-user at lemon.cs.elte.hu")
+ SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
+ CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\"
+ ")
+ SET(CPACK_NSIS_DELETE_ICONS_EXTRA "
+ !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+ Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\"
+ ")
- INCLUDE(CPack)
-ENDIF(WIN32)
+ INCLUDE(CPack)
+ ENDIF(WIN32)
+ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,10 +1,14 @@
-LEMON code without an explicit copyright is covered by the following
+LEMON code without an explicit copyright notice is covered by the following
copyright/license.
Copyright (C) 2003-2009 Egervary Jeno Kombinatorikus Optimalizalasi
Kutatocsoport (Egervary Combinatorial Optimization Research Group,
EGRES).
+===========================================================================
+Boost Software License, Version 1.0
+===========================================================================
+
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
@@ -26,8 +30,3 @@
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-
-===========================================================================
-This license is a verbatim copy of the Boost Software License, Version 1.0.
-
-
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+2009-03-27 LEMON joins to the COIN-OR initiative
+
+ COIN-OR (Computational Infrastructure for Operations Research,
+ http://www.coin-or.org) project is an initiative to spur the
+ development of open-source software for the operations research
+ community.
+
2008-10-13 Version 1.0 released
This is the first stable release of LEMON. Compared to the 0.x
diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt
--- a/demo/CMakeLists.txt
+++ b/demo/CMakeLists.txt
@@ -1,9 +1,9 @@
INCLUDE_DIRECTORIES(
- ${CMAKE_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}
+ ${PROJECT_SOURCE_DIR}
+ ${PROJECT_BINARY_DIR}
)
-LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
+LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)
SET(DEMOS
arg_parser_demo
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,11 +1,11 @@
SET(PACKAGE_NAME ${PROJECT_NAME})
SET(PACKAGE_VERSION ${PROJECT_VERSION})
-SET(abs_top_srcdir ${CMAKE_SOURCE_DIR})
-SET(abs_top_builddir ${CMAKE_BINARY_DIR})
+SET(abs_top_srcdir ${PROJECT_SOURCE_DIR})
+SET(abs_top_builddir ${PROJECT_BINARY_DIR})
CONFIGURE_FILE(
- ${CMAKE_SOURCE_DIR}/doc/Doxyfile.in
- ${CMAKE_BINARY_DIR}/doc/Doxyfile
+ ${PROJECT_SOURCE_DIR}/doc/Doxyfile.in
+ ${PROJECT_BINARY_DIR}/doc/Doxyfile
@ONLY)
IF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)
diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
--- a/lemon/CMakeLists.txt
+++ b/lemon/CMakeLists.txt
@@ -1,6 +1,6 @@
INCLUDE_DIRECTORIES(
- ${CMAKE_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}
+ ${PROJECT_SOURCE_DIR}
+ ${PROJECT_BINARY_DIR}
)
CONFIGURE_FILE(
diff --git a/lemon/Makefile.am b/lemon/Makefile.am
--- a/lemon/Makefile.am
+++ b/lemon/Makefile.am
@@ -17,6 +17,7 @@
lemon_libemon_la_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
$(GLPK_CFLAGS) \
$(CPLEX_CFLAGS) \
$(SOPLEX_CXXFLAGS) \
diff --git a/lemon/cplex.cc b/lemon/cplex.cc
--- a/lemon/cplex.cc
+++ b/lemon/cplex.cc
@@ -2,7 +2,7 @@
*
* This file is a part of LEMON, a generic C++ optimization library.
*
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2009
* Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Research Group on Combinatorial Optimization, EGRES).
*
@@ -441,13 +441,13 @@
// CplexLp members
CplexLp::CplexLp()
- : LpBase(), CplexBase(), LpSolver() {}
+ : LpBase(), LpSolver(), CplexBase() {}
CplexLp::CplexLp(const CplexEnv& env)
- : LpBase(), CplexBase(env), LpSolver() {}
+ : LpBase(), LpSolver(), CplexBase(env) {}
CplexLp::CplexLp(const CplexLp& other)
- : LpBase(), CplexBase(other), LpSolver() {}
+ : LpBase(), LpSolver(), CplexBase(other) {}
CplexLp::~CplexLp() {}
@@ -798,7 +798,7 @@
// CplexMip members
CplexMip::CplexMip()
- : LpBase(), CplexBase(), MipSolver() {
+ : LpBase(), MipSolver(), CplexBase() {
#if CPX_VERSION < 800
CPXchgprobtype(cplexEnv(), _prob, CPXPROB_MIP);
@@ -808,7 +808,7 @@
}
CplexMip::CplexMip(const CplexEnv& env)
- : LpBase(), CplexBase(env), MipSolver() {
+ : LpBase(), MipSolver(), CplexBase(env) {
#if CPX_VERSION < 800
CPXchgprobtype(cplexEnv(), _prob, CPXPROB_MIP);
@@ -819,7 +819,7 @@
}
CplexMip::CplexMip(const CplexMip& other)
More information about the Lemon-commits
mailing list