Changes in / [680:f5c710df882c:676:70a356a461a5] in lemon

Files:

• CMakeLists.txt (modified) (2 diffs)
• cmake/FindCOIN.cmake (modified) (1 diff)
• cmake/FindCPLEX.cmake (modified) (1 diff)
• cmake/FindGLPK.cmake (modified) (1 diff)
• configure.ac (modified) (1 diff)
• lemon/CMakeLists.txt (modified) (3 diffs)
• lemon/Makefile.am (modified) (1 diff)
• lemon/bits/default_map.h (modified) (1 diff)
• lemon/config.h.cmake (modified) (1 diff)
• lemon/config.h.in (modified) (1 diff)
• lemon/lp.h (modified) (2 diffs)
• m4/lx_check_coin.m4 (modified) (2 diffs)
• m4/lx_check_cplex.m4 (modified) (1 diff)
• m4/lx_check_glpk.m4 (modified) (1 diff)
• m4/lx_check_soplex.m4 (modified) (1 diff)
• scripts/unify-sources.sh (modified) (2 diffs)
• test/CMakeLists.txt (modified) (5 diffs)
• test/lp_test.cc (modified) (5 diffs)
• test/mip_test.cc (modified) (4 diffs)
• tools/dimacs-solver.cc (modified) (2 diffs)

CMakeLists.txt

@@ -18 +18 @@
 FIND_PACKAGE(COIN)
 
+ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+
 IF(MSVC)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996")
@@ -28 +30 @@
 
 INCLUDE(CheckTypeSize)
-CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)
+CHECK_TYPE_SIZE("long long" LONG_LONG)
 
 ENABLE_TESTING()

cmake/FindCOIN.cmake

@@ -62 +62 @@
 
 IF(COIN_FOUND)
-  SET(LEMON_HAVE_LP TRUE)
-  SET(LEMON_HAVE_MIP TRUE)
-  SET(LEMON_HAVE_CLP TRUE)
-  SET(LEMON_HAVE_CBC TRUE)
+  SET(HAVE_LP TRUE)
+  SET(HAVE_MIP TRUE)
+  SET(HAVE_CLP TRUE)
+  SET(HAVE_CBC TRUE)
 ENDIF(COIN_FOUND)

cmake/FindCPLEX.cmake

@@ -22 +22 @@
 
 IF(CPLEX_FOUND)
-  SET(LEMON_HAVE_LP TRUE)
-  SET(LEMON_HAVE_MIP TRUE)
-  SET(LEMON_HAVE_CPLEX TRUE)
+  SET(HAVE_LP TRUE)
+  SET(HAVE_MIP TRUE)
+  SET(HAVE_CPLEX TRUE)
 ENDIF(CPLEX_FOUND)

cmake/FindGLPK.cmake

@@ -22 +22 @@
 
 IF(GLPK_FOUND)
-  SET(LEMON_HAVE_LP TRUE)
-  SET(LEMON_HAVE_MIP TRUE)
-  SET(LEMON_HAVE_GLPK TRUE)
+  SET(HAVE_LP TRUE)
+  SET(HAVE_MIP TRUE)
+  SET(HAVE_GLPK TRUE)
 ENDIF(GLPK_FOUND)

configure.ac

@@ -26 +26 @@
 AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])
 if test x"$long_long_found" = x"yes"; then
-  AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
+  AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
 fi
 

lemon/CMakeLists.txt

@@ -19 +19 @@
 )
 
-IF(LEMON_HAVE_GLPK)
+IF(HAVE_GLPK)
   SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
   INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIRS})
@@ -27 +27 @@
     INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
   ENDIF(WIN32)
-ENDIF(LEMON_HAVE_GLPK)
+ENDIF(HAVE_GLPK)
 
-IF(LEMON_HAVE_CPLEX)
+IF(HAVE_CPLEX)
   SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc)
   INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS})
-ENDIF(LEMON_HAVE_CPLEX)
+ENDIF(HAVE_CPLEX)
 
-IF(LEMON_HAVE_CLP)
+IF(HAVE_CLP)
   SET(LEMON_SOURCES ${LEMON_SOURCES} clp.cc)
   INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
-ENDIF(LEMON_HAVE_CLP)
+ENDIF(HAVE_CLP)
 
-IF(LEMON_HAVE_CBC)
+IF(HAVE_CBC)
   SET(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc)
   INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
-ENDIF(LEMON_HAVE_CBC)
+ENDIF(HAVE_CBC)
 
 ADD_LIBRARY(lemon ${LEMON_SOURCES})
@@ -56 +56 @@
   COMPONENT headers
   FILES_MATCHING PATTERN "*.h")
-
-INSTALL(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
-  DESTINATION include/lemon
-  COMPONENT headers)

lemon/Makefile.am

@@ -58 +58 @@
         lemon/bfs.h \
         lemon/bin_heap.h \
-        lemon/cbc.h \
         lemon/circulation.h \
         lemon/clp.h \
         lemon/color.h \
         lemon/concept_check.h \
-        lemon/config.h \
         lemon/connectivity.h \
         lemon/counter.h \

lemon/bits/default_map.h

@@ -98 +98 @@
 
 
-#if defined LEMON_HAVE_LONG_LONG
+#if defined HAVE_LONG_LONG
 
   // long long

lemon/config.h.cmake

@@ -1 @@
-#cmakedefine LEMON_HAVE_LONG_LONG 1
-#cmakedefine LEMON_HAVE_LP 1
-#cmakedefine LEMON_HAVE_MIP 1
-#cmakedefine LEMON_HAVE_GLPK 1
-#cmakedefine LEMON_HAVE_CPLEX 1
-#cmakedefine LEMON_HAVE_CLP 1
-#cmakedefine LEMON_HAVE_CBC 1
+#cmakedefine HAVE_LONG_LONG 1
+#cmakedefine HAVE_LP 1
+#cmakedefine HAVE_MIP 1
+#cmakedefine HAVE_GLPK 1
+#cmakedefine HAVE_CPLEX 1
+#cmakedefine HAVE_CLP 1
+#cmakedefine HAVE_CBC 1

lemon/config.h.in

@@ -1 +1 @@
 /* Define to 1 if you have long long */
-#undef LEMON_HAVE_LONG_LONG
+#undef HAVE_LONG_LONG
 
 /* Define to 1 if you have any LP solver. */
-#undef LEMON_HAVE_LP
+#undef HAVE_LP
 
 /* Define to 1 if you have any MIP solver. */
-#undef LEMON_HAVE_MIP
+#undef HAVE_MIP
 
 /* Define to 1 if you have CPLEX. */
-#undef LEMON_HAVE_CPLEX
+#undef HAVE_CPLEX
 
 /* Define to 1 if you have GLPK. */
-#undef LEMON_HAVE_GLPK
+#undef HAVE_GLPK
 
 /* Define to 1 if you have SOPLEX */
-#undef LEMON_HAVE_SOPLEX
+#undef HAVE_SOPLEX
 
 /* Define to 1 if you have CLP */
-#undef LEMON_HAVE_CLP
+#undef HAVE_CLP
 
 /* Define to 1 if you have CBC */
-#undef LEMON_HAVE_CBC
+#undef HAVE_CBC

lemon/lp.h

@@ -23 +23 @@
 
 
-#ifdef LEMON_HAVE_GLPK
+#ifdef HAVE_GLPK
 #include <lemon/glpk.h>
-#elif LEMON_HAVE_CPLEX
+#elif HAVE_CPLEX
 #include <lemon/cplex.h>
-#elif LEMON_HAVE_SOPLEX
+#elif HAVE_SOPLEX
 #include <lemon/soplex.h>
-#elif LEMON_HAVE_CLP
+#elif HAVE_CLP
 #include <lemon/clp.h>
 #endif
@@ -70 +70 @@
   typedef GlpkMip Mip;
 #else
-#ifdef LEMON_HAVE_GLPK
+#ifdef HAVE_GLPK
 # define LEMON_DEFAULT_LP GLPK
   typedef GlpkLp Lp;
 # define LEMON_DEFAULT_MIP GLPK
   typedef GlpkMip Mip;
-#elif LEMON_HAVE_CPLEX
+#elif HAVE_CPLEX
 # define LEMON_DEFAULT_LP CPLEX
   typedef CplexLp Lp;
 # define LEMON_DEFAULT_MIP CPLEX
   typedef CplexMip Mip;
-#elif LEMON_HAVE_SOPLEX
+#elif HAVE_SOPLEX
 # define DEFAULT_LP SOPLEX
   typedef SoplexLp Lp;
-#elif LEMON_HAVE_CLP
+#elif HAVE_CLP
 # define DEFAULT_LP CLP
   typedef ClpLp Lp;  

m4/lx_check_coin.m4

@@ -56 +56 @@
 
     if test x"$lx_clp_found" = x"yes"; then
-      AC_DEFINE([LEMON_HAVE_CLP], [1], [Define to 1 if you have CLP.])
+      AC_DEFINE([HAVE_CLP], [1], [Define to 1 if you have CLP.])
       lx_lp_found=yes
-      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
       AC_MSG_RESULT([yes])
     else
@@ -116 +116 @@
 
       if test x"$lx_cbc_found" = x"yes"; then
-        AC_DEFINE([LEMON_HAVE_CBC], [1], [Define to 1 if you have CBC.])
+        AC_DEFINE([HAVE_CBC], [1], [Define to 1 if you have CBC.])
         lx_lp_found=yes
-        AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+        AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
         lx_mip_found=yes
-        AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
+        AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
         AC_MSG_RESULT([yes])
       else

m4/lx_check_cplex.m4

@@ -62 +62 @@
 
     if test x"$lx_cplex_found" = x"yes"; then
-      AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
+      AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
       lx_lp_found=yes
-      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
       lx_mip_found=yes
-      AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
+      AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
       AC_MSG_RESULT([yes])
     else

m4/lx_check_glpk.m4

@@ -65 +65 @@
 
     if test x"$lx_glpk_found" = x"yes"; then
-      AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
+      AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
       lx_lp_found=yes
-      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
       lx_mip_found=yes
-      AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
+      AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
       AC_MSG_RESULT([yes])
     else

m4/lx_check_soplex.m4

@@ -56 +56 @@
 
     if test x"$lx_soplex_found" = x"yes"; then
-      AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
+      AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
       lx_lp_found=yes
-      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
       AC_MSG_RESULT([yes])
     else

scripts/unify-sources.sh

@@ -1 +1 @@
 #!/bin/bash
 
-YEAR=`date +%Y`
+YEAR=`date +2003-%Y`
 HGROOT=`hg root`
-
-function hg_year() {
-    if [ -n "$(hg st $1)" ]; then
-        echo $YEAR
-}
 
 # file enumaration modes
@@ -197 +192 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-"$(hg_year $1)"
+ * Copyright (C) "$YEAR"
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).

test/CMakeLists.txt

@@ -37 +37 @@
   unionfind_test)
 
-IF(LEMON_HAVE_LP)
+IF(HAVE_LP)
   ADD_EXECUTABLE(lp_test lp_test.cc)
   SET(LP_TEST_LIBS lemon)
-  IF(LEMON_HAVE_GLPK)
+  IF(HAVE_GLPK)
     SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
-  ENDIF(LEMON_HAVE_GLPK)
-  IF(LEMON_HAVE_CPLEX)
+  ENDIF(HAVE_GLPK)
+  IF(HAVE_CPLEX)
     SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
-  ENDIF(LEMON_HAVE_CPLEX)
-  IF(LEMON_HAVE_CLP)
+  ENDIF(HAVE_CPLEX)
+  IF(HAVE_CLP)
     SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})
-  ENDIF(LEMON_HAVE_CLP)
+  ENDIF(HAVE_CLP)
   TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
   ADD_TEST(lp_test lp_test)
 
-  IF(WIN32 AND LEMON_HAVE_GLPK)
+  IF(WIN32 AND HAVE_GLPK)
     GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
     GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
@@ -60 +60 @@
       COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
     )
-  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
-  IF(WIN32 AND LEMON_HAVE_CPLEX)
+  ENDIF(WIN32 AND HAVE_GLPK)
+  IF(WIN32 AND HAVE_CPLEX)
     GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
     GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
@@ -67 +67 @@
       COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
     )
-  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
-ENDIF(LEMON_HAVE_LP)
+  ENDIF(WIN32 AND HAVE_CPLEX)
+ENDIF(HAVE_LP)
 
-IF(LEMON_HAVE_MIP)
+IF(HAVE_MIP)
   ADD_EXECUTABLE(mip_test mip_test.cc)
   SET(MIP_TEST_LIBS lemon)
-  IF(LEMON_HAVE_GLPK)
+  IF(HAVE_GLPK)
     SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
-  ENDIF(LEMON_HAVE_GLPK)
-  IF(LEMON_HAVE_CPLEX)
+  ENDIF(HAVE_GLPK)
+  IF(HAVE_CPLEX)
     SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
-  ENDIF(LEMON_HAVE_CPLEX)
-  IF(LEMON_HAVE_CBC)
+  ENDIF(HAVE_CPLEX)
+  IF(HAVE_CBC)
     SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})
-  ENDIF(LEMON_HAVE_CBC)
+  ENDIF(HAVE_CBC)
   TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
   ADD_TEST(mip_test mip_test)
 
-  IF(WIN32 AND LEMON_HAVE_GLPK)
+  IF(WIN32 AND HAVE_GLPK)
     GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
     GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
@@ -93 +93 @@
       COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
     )
-  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
-  IF(WIN32 AND LEMON_HAVE_CPLEX)
+  ENDIF(WIN32 AND HAVE_GLPK)
+  IF(WIN32 AND HAVE_CPLEX)
     GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
     GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
@@ -100 +100 @@
       COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
     )
-  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
-ENDIF(LEMON_HAVE_MIP)
+  ENDIF(WIN32 AND HAVE_CPLEX)
+ENDIF(HAVE_MIP)
 
 FOREACH(TEST_NAME ${TESTS})

test/lp_test.cc

@@ -22 +22 @@
 #include <lemon/tolerance.h>
 
+#ifdef HAVE_CONFIG_H
 #include <lemon/config.h>
-
-#ifdef LEMON_HAVE_GLPK
+#endif
+
+#ifdef HAVE_GLPK
 #include <lemon/glpk.h>
 #endif
 
-#ifdef LEMON_HAVE_CPLEX
+#ifdef HAVE_CPLEX
 #include <lemon/cplex.h>
 #endif
 
-#ifdef LEMON_HAVE_SOPLEX
+#ifdef HAVE_SOPLEX
 #include <lemon/soplex.h>
 #endif
 
-#ifdef LEMON_HAVE_CLP
+#ifdef HAVE_CLP
 #include <lemon/clp.h>
 #endif
@@ -378 +380 @@
   lpTest(lp_skel);
 
-#ifdef LEMON_HAVE_GLPK
+#ifdef HAVE_GLPK
   {
     GlpkLp lp_glpk1,lp_glpk2;
@@ -387 +389 @@
 #endif
 
-#ifdef LEMON_HAVE_CPLEX
+#ifdef HAVE_CPLEX
   try {
     CplexLp lp_cplex1,lp_cplex2;
@@ -398 +400 @@
 #endif
 
-#ifdef LEMON_HAVE_SOPLEX
+#ifdef HAVE_SOPLEX
   {
     SoplexLp lp_soplex1,lp_soplex2;
@@ -407 +409 @@
 #endif
 
-#ifdef LEMON_HAVE_CLP
+#ifdef HAVE_CLP
   {
     ClpLp lp_clp1,lp_clp2;

test/mip_test.cc

@@ -19 +19 @@
 #include "test_tools.h"
 
+#ifdef HAVE_CONFIG_H
 #include <lemon/config.h>
+#endif
 
-#ifdef LEMON_HAVE_CPLEX
+#ifdef HAVE_CPLEX
 #include <lemon/cplex.h>
 #endif
 
-#ifdef LEMON_HAVE_GLPK
+#ifdef HAVE_GLPK
 #include <lemon/glpk.h>
 #endif
 
-#ifdef LEMON_HAVE_CBC
+#ifdef HAVE_CBC
 #include <lemon/cbc.h>
 #endif
@@ -128 +130 @@
 {
 
-#ifdef LEMON_HAVE_GLPK
+#ifdef HAVE_GLPK
   {
     GlpkMip mip1;
@@ -136 +138 @@
 #endif
 
-#ifdef LEMON_HAVE_CPLEX
+#ifdef HAVE_CPLEX
   try {
     CplexMip mip2;
@@ -146 +148 @@
 #endif
 
-#ifdef LEMON_HAVE_CBC
+#ifdef HAVE_CBC
   {
     CbcMip mip1;

tools/dimacs-solver.cc

@@ -201 +201 @@
     .boolOption("int","Use 'int' for capacities, costs etc. (default)")
     .optionGroup("datatype","int")
-#ifdef LEMON_HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG
     .boolOption("long","Use 'long long' for capacities, costs etc.")
     .optionGroup("datatype","long")
@@ -268 +268 @@
   else if(ap.given("ldouble"))
     solve<long double>(ap,is,os,desc);
-#ifdef LEMON_HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG
   else if(ap.given("long"))
     solve<long long>(ap,is,os,desc);