LEMON/LEMON-official Changeset - r674:20dac2104519

CMakeLists.txt

Show inline comments

 		CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 		IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
 		  INCLUDE(${CMAKE_SOURCE_DIR}/cmake/version.cmake)
 		ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
 		  SET(PROJECT_NAME "LEMON")
 		  SET(PROJECT_VERSION "hg-tip" CACHE STRING "LEMON version string.")
 		ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
 		PROJECT(${PROJECT_NAME})
 		SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 		INCLUDE(FindDoxygen)
 		INCLUDE(FindGhostscript)
 		FIND_PACKAGE(GLPK 4.33)
 		FIND_PACKAGE(CPLEX)
 		FIND_PACKAGE(COIN)
 		ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 		IF(MSVC)
 		  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996")
 		# Suppressed warnings:
 		# C4250: 'class1' : inherits 'class2::member' via dominance
 		# C4355: 'this' : used in base member initializer list
 		# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
 		# C4996: 'function': was declared deprecated
 		ENDIF(MSVC)
 		ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 		INCLUDE(CheckTypeSize)
-		CHECK_TYPE_SIZE("long long" LONG_LONG)
+		CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)
 		ENABLE_TESTING()
 		ADD_SUBDIRECTORY(lemon)
 		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(${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_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_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")

cmake/FindCOIN.cmake

Show inline comments

@@ -32,37 +32,37 @@
 		  COIN_CGL_LIBRARY
 		  COIN_CLP_LIBRARY
 		  COIN_COIN_UTILS_LIBRARY
 		  COIN_OSI_LIBRARY
 		  COIN_OSI_CBC_LIBRARY
 		  COIN_OSI_CLP_LIBRARY
 		  COIN_OSI_VOL_LIBRARY
 		  COIN_VOL_LIBRARY
+		)
 		IF(COIN_FOUND)
 		  SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR})
 		  SET(COIN_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_OSI_VOL_LIBRARY};${COIN_VOL_LIBRARY}")
 		  SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}")
 		  SET(COIN_CBC_LIBRARIES ${COIN_LIBRARIES})
 		ENDIF(COIN_FOUND)
 		MARK_AS_ADVANCED(
 		  COIN_INCLUDE_DIR
 		  COIN_CBC_LIBRARY
 		  COIN_CBC_SOLVER_LIBRARY
 		  COIN_CGL_LIBRARY
 		  COIN_CLP_LIBRARY
 		  COIN_COIN_UTILS_LIBRARY
 		  COIN_OSI_LIBRARY
 		  COIN_OSI_CBC_LIBRARY
 		  COIN_OSI_CLP_LIBRARY
 		  COIN_OSI_VOL_LIBRARY
 		  COIN_VOL_LIBRARY
+		)
 		IF(COIN_FOUND)
 		  SET(HAVE_LP TRUE)
 		  SET(HAVE_MIP TRUE)
 		  SET(HAVE_CLP TRUE)
 		  SET(HAVE_CBC TRUE)
 		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_CLP TRUE)
 		  SET(LEMON_HAVE_CBC TRUE)
 		ENDIF(COIN_FOUND)

cmake/FindCPLEX.cmake

Show inline comments

 		FIND_PATH(CPLEX_INCLUDE_DIR
 		  ilcplex/cplex.h
 		  PATHS "C:/ILOG/CPLEX91/include")
 		FIND_LIBRARY(CPLEX_LIBRARY
 		  NAMES cplex91
 		  PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda")
 		INCLUDE(FindPackageHandleStandardArgs)
 		FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPLEX DEFAULT_MSG CPLEX_LIBRARY CPLEX_INCLUDE_DIR)
 		FIND_PATH(CPLEX_BIN_DIR
 		  cplex91.dll
 		  PATHS "C:/ILOG/CPLEX91/bin/x86_win32")
 		IF(CPLEX_FOUND)
 		  SET(CPLEX_INCLUDE_DIRS ${CPLEX_INCLUDE_DIR})
 		  SET(CPLEX_LIBRARIES ${CPLEX_LIBRARY})
 		ENDIF(CPLEX_FOUND)
 		MARK_AS_ADVANCED(CPLEX_LIBRARY CPLEX_INCLUDE_DIR CPLEX_BIN_DIR)
 		IF(CPLEX_FOUND)
 		  SET(HAVE_LP TRUE)
 		  SET(HAVE_MIP TRUE)
-		  SET(HAVE_CPLEX TRUE)
+		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_CPLEX TRUE)
 		ENDIF(CPLEX_FOUND)

cmake/FindGLPK.cmake

Show inline comments

 		SET(GLPK_REGKEY "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Glpk;InstallPath]")
 		GET_FILENAME_COMPONENT(GLPK_ROOT_PATH ${GLPK_REGKEY} ABSOLUTE)
 		FIND_PATH(GLPK_INCLUDE_DIR
 		  glpk.h
 		  PATHS ${GLPK_REGKEY}/include)
 		FIND_LIBRARY(GLPK_LIBRARY
 		  NAMES glpk
 		  PATHS ${GLPK_REGKEY}/lib)
 		INCLUDE(FindPackageHandleStandardArgs)
 		FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLPK DEFAULT_MSG GLPK_LIBRARY GLPK_INCLUDE_DIR)
 		IF(GLPK_FOUND)
 		  SET(GLPK_INCLUDE_DIRS ${GLPK_INCLUDE_DIR})
 		  SET(GLPK_LIBRARIES ${GLPK_LIBRARY})
 		  SET(GLPK_BIN_DIR ${GLPK_ROOT_PATH}/bin)
 		ENDIF(GLPK_FOUND)
 		MARK_AS_ADVANCED(GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_BIN_DIR)
 		IF(GLPK_FOUND)
 		  SET(HAVE_LP TRUE)
 		  SET(HAVE_MIP TRUE)
-		  SET(HAVE_GLPK TRUE)
+		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_GLPK TRUE)
 		ENDIF(GLPK_FOUND)

configure.ac

Show inline comments

 		dnl Process this file with autoconf to produce a configure script.
 		dnl Version information.
 		m4_define([lemon_version_number],
 			[m4_normalize(esyscmd([echo ${LEMON_VERSION}]))])
 		dnl m4_define([lemon_version_number], [])
 		m4_define([lemon_hg_path], [m4_normalize(esyscmd([./scripts/chg-len.py]))])
 		m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i]))])
 		m4_define([lemon_version], [ifelse(lemon_version_number(),
 					   [],
 					   [lemon_hg_path().lemon_hg_revision()],
 					   [lemon_version_number()])])
 		AC_PREREQ([2.59])
 		AC_INIT([LEMON], [lemon_version()], [lemon-user@lemon.cs.elte.hu], [lemon])
 		AC_CONFIG_AUX_DIR([build-aux])
 		AC_CONFIG_MACRO_DIR([m4])
 		AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc])
 		AC_CONFIG_SRCDIR([lemon/list_graph.h])
 		AC_CONFIG_HEADERS([config.h lemon/config.h])
 		dnl Do compilation tests using the C++ compiler.
 		AC_LANG([C++])
 		dnl Check the existence of long long type.
 		AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])
 		if test x"$long_long_found" = x"yes"; then
-		  AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
+		  AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
 		fi
 		dnl Checks for programs.
 		AC_PROG_CXX
 		AC_PROG_CXXCPP
 		AC_PROG_INSTALL
 		AC_DISABLE_SHARED
 		AC_PROG_LIBTOOL
 		AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no])
 		AC_CHECK_PROG([gs_found],[gs],[yes],[no])
 		dnl Detect Intel compiler.
 		AC_MSG_CHECKING([whether we are using the Intel C++ compiler])
 		AC_COMPILE_IFELSE([#ifndef __INTEL_COMPILER
 		choke me
 		#endif], [ICC=[yes]], [ICC=[no]])
 		if test x"$ICC" = x"yes"; then
 		  AC_MSG_RESULT([yes])
 		else
 		  AC_MSG_RESULT([no])
 		fi
 		dnl Set custom compiler flags when using g++.
 		if test "$GXX" = yes -a "$ICC" = no; then
 		  WARNINGCXXFLAGS="-Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"
 		fi
 		AC_SUBST([WARNINGCXXFLAGS])
 		dnl Checks for libraries.
 		LX_CHECK_GLPK
 		LX_CHECK_CPLEX

lemon/CMakeLists.txt

Show inline comments

 		INCLUDE_DIRECTORIES(
 		  ${PROJECT_SOURCE_DIR}
 		  ${PROJECT_BINARY_DIR}
+		)
 		CONFIGURE_FILE(
 		  ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
 		  ${CMAKE_CURRENT_BINARY_DIR}/config.h
+		)
 		SET(LEMON_SOURCES
 		  arg_parser.cc
 		  base.cc
 		  color.cc
 		  lp_base.cc
 		  lp_skeleton.cc
 		  random.cc
 		  bits/windows.cc
+		)
-		IF(HAVE_GLPK)
+		IF(LEMON_HAVE_GLPK)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
 		  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIRS})
 		  IF(WIN32)
 		    INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)
 		    INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)
 		    INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
 		  ENDIF(WIN32)
-		ENDIF(HAVE_GLPK)
+		ENDIF(LEMON_HAVE_GLPK)
-		IF(HAVE_CPLEX)
+		IF(LEMON_HAVE_CPLEX)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc)
 		  INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS})
-		ENDIF(HAVE_CPLEX)
+		ENDIF(LEMON_HAVE_CPLEX)
-		IF(HAVE_CLP)
+		IF(LEMON_HAVE_CLP)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} clp.cc)
 		  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
-		ENDIF(HAVE_CLP)
+		ENDIF(LEMON_HAVE_CLP)
-		IF(HAVE_CBC)
+		IF(LEMON_HAVE_CBC)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc)
 		  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
-		ENDIF(HAVE_CBC)
+		ENDIF(LEMON_HAVE_CBC)
 		ADD_LIBRARY(lemon ${LEMON_SOURCES})
 		INSTALL(
 		  TARGETS lemon
 		  ARCHIVE DESTINATION lib
 		  COMPONENT library)
 		INSTALL(
 		  DIRECTORY . bits concepts
 		  DESTINATION include/lemon
 		  COMPONENT headers
 		  FILES_MATCHING PATTERN "*.h")
 		INSTALL(
 		  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
 		  DESTINATION include/lemon
 		  COMPONENT headers)

lemon/Makefile.am

Show inline comments

@@ -32,64 +32,65 @@
 			$(CBC_LIBS)
 		if HAVE_GLPK
 		lemon_libemon_la_SOURCES += lemon/glpk.cc
 		endif
 		if HAVE_CPLEX
 		lemon_libemon_la_SOURCES += lemon/cplex.cc
 		endif
 		if HAVE_SOPLEX
 		lemon_libemon_la_SOURCES += lemon/soplex.cc
 		endif
 		if HAVE_CLP
 		lemon_libemon_la_SOURCES += lemon/clp.cc
 		endif
 		if HAVE_CBC
 		lemon_libemon_la_SOURCES += lemon/cbc.cc
 		endif
 		lemon_HEADERS += \
 			lemon/adaptors.h \
 			lemon/arg_parser.h \
 			lemon/assert.h \
 			lemon/bfs.h \
 			lemon/bin_heap.h \
 			lemon/circulation.h \
 			lemon/clp.h \
 			lemon/color.h \
 			lemon/concept_check.h \
 			lemon/config.h \
 			lemon/connectivity.h \
 			lemon/counter.h \
 			lemon/core.h \
 			lemon/cplex.h \
 			lemon/dfs.h \
 			lemon/dijkstra.h \
 			lemon/dim2.h \
 			lemon/dimacs.h \
 			lemon/edge_set.h \
 			lemon/elevator.h \
 			lemon/error.h \
 			lemon/euler.h \
 			lemon/full_graph.h \
 			lemon/glpk.h \
 			lemon/gomory_hu.h \
 			lemon/graph_to_eps.h \
 			lemon/grid_graph.h \
 			lemon/hypercube_graph.h \
 			lemon/kruskal.h \
 			lemon/hao_orlin.h \
 			lemon/lgf_reader.h \
 			lemon/lgf_writer.h \
 			lemon/list_graph.h \
 			lemon/lp.h \
 			lemon/lp_base.h \
 			lemon/lp_skeleton.h \
 			lemon/list_graph.h \
 			lemon/maps.h \
 			lemon/matching.h \
 			lemon/math.h \
 			lemon/min_cost_arborescence.h \
 			lemon/nauty_reader.h \

lemon/bits/default_map.h

Show inline comments

@@ -68,65 +68,65 @@
 		  };
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, unsigned int> {
 		    typedef VectorMap<_Graph, _Item, unsigned int> Map;
 		  };
 		  // short
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, signed short> {
 		    typedef VectorMap<_Graph, _Item, signed short> Map;
 		  };
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, unsigned short> {
 		    typedef VectorMap<_Graph, _Item, unsigned short> Map;
 		  };
 		  // long
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, signed long> {
 		    typedef VectorMap<_Graph, _Item, signed long> Map;
 		  };
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, unsigned long> {
 		    typedef VectorMap<_Graph, _Item, unsigned long> Map;
 		  };
-		#if defined HAVE_LONG_LONG
+		#if defined LEMON_HAVE_LONG_LONG
 		  // long long
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, signed long long> {
 		    typedef VectorMap<_Graph, _Item, signed long long> Map;
 		  };
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, unsigned long long> {
 		    typedef VectorMap<_Graph, _Item, unsigned long long> Map;
 		  };
 		#endif
 		  // float
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, float> {
 		    typedef VectorMap<_Graph, _Item, float> Map;
 		  };
 		  // double
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, double> {
 		    typedef VectorMap<_Graph, _Item,  double> Map;
 		  };
 		  // long double
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, long double> {

lemon/config.h.cmake

Show inline comments

 		#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
+		#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

lemon/config.h.in

Show inline comments

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

lemon/lp.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_LP_H
 		#define LEMON_LP_H
 		#include<lemon/config.h>
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
 		#include <lemon/glpk.h>
-		#elif HAVE_CPLEX
+		#elif LEMON_HAVE_CPLEX
 		#include <lemon/cplex.h>
-		#elif HAVE_SOPLEX
+		#elif LEMON_HAVE_SOPLEX
 		#include <lemon/soplex.h>
-		#elif HAVE_CLP
+		#elif LEMON_HAVE_CLP
 		#include <lemon/clp.h>
 		#endif
 		///\file
 		///\brief Defines a default LP solver
 		///\ingroup lp_group
 		namespace lemon {
 		#ifdef DOXYGEN
 		  ///The default LP solver identifier
 		  ///The default LP solver identifier.
 		  ///\ingroup lp_group
 		  ///
 		  ///Currently, the possible values are \c GLPK, \c CPLEX,
 		  ///\c SOPLEX or \c CLP
 		#define LEMON_DEFAULT_LP SOLVER
 		  ///The default LP solver
 		  ///The default LP solver.
 		  ///\ingroup lp_group
 		  ///
 		  ///Currently, it is either \c GlpkLp, \c CplexLp, \c SoplexLp or \c ClpLp
 		  typedef GlpkLp Lp;
 		  ///The default MIP solver identifier
 		  ///The default MIP solver identifier.
 		  ///\ingroup lp_group
 		  ///
 		  ///Currently, the possible values are \c GLPK or \c CPLEX
 		#define LEMON_DEFAULT_MIP SOLVER
 		  ///The default MIP solver.
 		  ///The default MIP solver.
 		  ///\ingroup lp_group
 		  ///
 		  ///Currently, it is either \c GlpkMip or \c CplexMip
 		  typedef GlpkMip Mip;
 		#else
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
 		# define LEMON_DEFAULT_LP GLPK
 		  typedef GlpkLp Lp;
 		# define LEMON_DEFAULT_MIP GLPK
 		  typedef GlpkMip Mip;
-		#elif HAVE_CPLEX
+		#elif LEMON_HAVE_CPLEX
 		# define LEMON_DEFAULT_LP CPLEX
 		  typedef CplexLp Lp;
 		# define LEMON_DEFAULT_MIP CPLEX
 		  typedef CplexMip Mip;
-		#elif HAVE_SOPLEX
+		#elif LEMON_HAVE_SOPLEX
 		# define DEFAULT_LP SOPLEX
 		  typedef SoplexLp Lp;
-		#elif HAVE_CLP
+		#elif LEMON_HAVE_CLP
 		# define DEFAULT_LP CLP
 		  typedef ClpLp Lp;
 		#endif
 		#endif
 		} //namespace lemon
 		#endif //LEMON_LP_H

m4/lx_check_coin.m4

Show inline comments

@@ -26,111 +26,111 @@
 		    if test x"$with_coin_libdir" != x"no"; then
 		      CLP_LDFLAGS="-L$with_coin_libdir"
 		    elif test x"$with_coin" != x"yes"; then
 		      CLP_LDFLAGS="-L$with_coin/lib"
 		    fi
 		    CLP_LIBS="-lClp -lCoinUtils -lm"
 		    lx_save_cxxflags="$CXXFLAGS"
 		    lx_save_ldflags="$LDFLAGS"
 		    lx_save_libs="$LIBS"
 		    CXXFLAGS="$CLP_CXXFLAGS"
 		    LDFLAGS="$CLP_LDFLAGS"
 		    LIBS="$CLP_LIBS"
 		    lx_clp_test_prog='
 		      #include <coin/ClpModel.hpp>
 		      int main(int argc, char** argv)
+		      {
 		        ClpModel clp;
 		        return 0;
 		      }'
 		    AC_LANG_PUSH(C++)
 		    AC_LINK_IFELSE([$lx_clp_test_prog], [lx_clp_found=yes], [lx_clp_found=no])
 		    AC_LANG_POP(C++)
 		    CXXFLAGS="$lx_save_cxxflags"
 		    LDFLAGS="$lx_save_ldflags"
 		    LIBS="$lx_save_libs"
 		    if test x"$lx_clp_found" = x"yes"; then
-		      AC_DEFINE([HAVE_CLP], [1], [Define to 1 if you have CLP.])
+		      AC_DEFINE([LEMON_HAVE_CLP], [1], [Define to 1 if you have CLP.])
 		      lx_lp_found=yes
-		      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+		      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
 		      AC_MSG_RESULT([yes])
 		    else
 		      CLP_CXXFLAGS=""
 		      CLP_LDFLAGS=""
 		      CLP_LIBS=""
 		      AC_MSG_RESULT([no])
 		    fi
 		  fi
 		  CLP_LIBS="$CLP_LDFLAGS $CLP_LIBS"
 		  AC_SUBST(CLP_CXXFLAGS)
 		  AC_SUBST(CLP_LIBS)
 		  AM_CONDITIONAL([HAVE_CLP], [test x"$lx_clp_found" = x"yes"])
 		  lx_cbc_found=no
 		  if test x"$lx_clp_found" = x"yes"; then
 		    if test x"$with_coin" != x"no"; then
 		      AC_MSG_CHECKING([for CBC])
 		      if test x"$with_coin_includedir" != x"no"; then
 		        CBC_CXXFLAGS="-I$with_coin_includedir"
 		      elif test x"$with_coin" != x"yes"; then
 		        CBC_CXXFLAGS="-I$with_coin/include"
 		      fi
 		      if test x"$with_coin_libdir" != x"no"; then
 		        CBC_LDFLAGS="-L$with_coin_libdir"
 		      elif test x"$with_coin" != x"yes"; then
 		        CBC_LDFLAGS="-L$with_coin/lib"
 		      fi
 		      CBC_LIBS="-lOsi -lCbc -lOsiCbc -lCbcSolver -lClp -lOsiClp -lCoinUtils -lVol -lOsiVol -lCgl -lm -llapack -lblas"
 		      lx_save_cxxflags="$CXXFLAGS"
 		      lx_save_ldflags="$LDFLAGS"
 		      lx_save_libs="$LIBS"
 		      CXXFLAGS="$CBC_CXXFLAGS"
 		      LDFLAGS="$CBC_LDFLAGS"
 		      LIBS="$CBC_LIBS"
 		      lx_cbc_test_prog='
 		        #include <coin/CbcModel.hpp>
 		        int main(int argc, char** argv)
+		        {
 		          CbcModel cbc;
 		          return 0;
 		        }'
 		      AC_LANG_PUSH(C++)
 		      AC_LINK_IFELSE([$lx_cbc_test_prog], [lx_cbc_found=yes], [lx_cbc_found=no])
 		      AC_LANG_POP(C++)
 		      CXXFLAGS="$lx_save_cxxflags"
 		      LDFLAGS="$lx_save_ldflags"
 		      LIBS="$lx_save_libs"
 		      if test x"$lx_cbc_found" = x"yes"; then
-		        AC_DEFINE([HAVE_CBC], [1], [Define to 1 if you have CBC.])
+		        AC_DEFINE([LEMON_HAVE_CBC], [1], [Define to 1 if you have CBC.])
 		        lx_lp_found=yes
-		        AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+		        AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
 		        lx_mip_found=yes
-		        AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
+		        AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
 		        AC_MSG_RESULT([yes])
 		      else
 		        CBC_CXXFLAGS=""
 		        CBC_LDFLAGS=""
 		        CBC_LIBS=""
 		        AC_MSG_RESULT([no])
 		      fi
 		    fi
 		  fi
 		  CBC_LIBS="$CBC_LDFLAGS $CBC_LIBS"
 		  AC_SUBST(CBC_CXXFLAGS)
 		  AC_SUBST(CBC_LIBS)
 		  AM_CONDITIONAL([HAVE_CBC], [test x"$lx_cbc_found" = x"yes"])
 		])

m4/lx_check_cplex.m4

Show inline comments

@@ -32,50 +32,50 @@
 		    elif test x"$CPLEX_LIBDIR" != x; then
 		      CPLEX_LDFLAGS="-L$CPLEX_LIBDIR"
 		    fi
 		    CPLEX_LIBS="-lcplex -lm -lpthread"
 		    lx_save_cxxflags="$CXXFLAGS"
 		    lx_save_ldflags="$LDFLAGS"
 		    lx_save_libs="$LIBS"
 		    CXXFLAGS="$CPLEX_CFLAGS"
 		    LDFLAGS="$CPLEX_LDFLAGS"
 		    LIBS="$CPLEX_LIBS"
 		    lx_cplex_test_prog='
 		      extern "C" {
 		      #include <ilcplex/cplex.h>
+		      }
 		      int main(int argc, char** argv)
+		      {
 		        CPXENVptr env = NULL;
 		        return 0;
 		      }'
 		    AC_LANG_PUSH(C++)
 		    AC_LINK_IFELSE([$lx_cplex_test_prog], [lx_cplex_found=yes], [lx_cplex_found=no])
 		    AC_LANG_POP(C++)
 		    CXXFLAGS="$lx_save_cxxflags"
 		    LDFLAGS="$lx_save_ldflags"
 		    LIBS="$lx_save_libs"
 		    if test x"$lx_cplex_found" = x"yes"; then
-		      AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
+		      AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
 		      lx_lp_found=yes
-		      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+		      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
 		      lx_mip_found=yes
-		      AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
+		      AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
 		      AC_MSG_RESULT([yes])
 		    else
 		      CPLEX_CFLAGS=""
 		      CPLEX_LDFLAGS=""
 		      CPLEX_LIBS=""
 		      AC_MSG_RESULT([no])
 		    fi
 		  fi
 		  CPLEX_LIBS="$CPLEX_LDFLAGS $CPLEX_LIBS"
 		  AC_SUBST(CPLEX_CFLAGS)
 		  AC_SUBST(CPLEX_LIBS)
 		  AM_CONDITIONAL([HAVE_CPLEX], [test x"$lx_cplex_found" = x"yes"])
 		])

m4/lx_check_glpk.m4

Show inline comments

@@ -35,50 +35,50 @@
 		    lx_save_libs="$LIBS"
 		    CXXFLAGS="$GLPK_CFLAGS"
 		    LDFLAGS="$GLPK_LDFLAGS"
 		    LIBS="$GLPK_LIBS"
 		    lx_glpk_test_prog='
 		      extern "C" {
 		      #include <glpk.h>
+		      }
 		      #if (GLP_MAJOR_VERSION < 4) \
 		         || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION < 33)
 		      #error Supported GLPK versions: 4.33 or above
 		      #endif
 		      int main(int argc, char** argv)
+		      {
 		        LPX *lp;
 		        lp = lpx_create_prob();
 		        lpx_delete_prob(lp);
 		        return 0;
 		      }'
 		    AC_LANG_PUSH(C++)
 		    AC_LINK_IFELSE([$lx_glpk_test_prog], [lx_glpk_found=yes], [lx_glpk_found=no])
 		    AC_LANG_POP(C++)
 		    CXXFLAGS="$lx_save_cxxflags"
 		    LDFLAGS="$lx_save_ldflags"
 		    LIBS="$lx_save_libs"
 		    if test x"$lx_glpk_found" = x"yes"; then
-		      AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
+		      AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
 		      lx_lp_found=yes
-		      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+		      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
 		      lx_mip_found=yes
-		      AC_DEFINE([HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
+		      AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
 		      AC_MSG_RESULT([yes])
 		    else
 		      GLPK_CFLAGS=""
 		      GLPK_LDFLAGS=""
 		      GLPK_LIBS=""
 		      AC_MSG_RESULT([no])
 		    fi
 		  fi
 		  GLPK_LIBS="$GLPK_LDFLAGS $GLPK_LIBS"
 		  AC_SUBST(GLPK_CFLAGS)
 		  AC_SUBST(GLPK_LIBS)
 		  AM_CONDITIONAL([HAVE_GLPK], [test x"$lx_glpk_found" = x"yes"])
 		])

m4/lx_check_soplex.m4

Show inline comments

@@ -26,48 +26,48 @@
 		    if test x"$with_soplex_libdir" != x"no"; then
 		      SOPLEX_LDFLAGS="-L$with_soplex_libdir"
 		    elif test x"$with_soplex" != x"yes"; then
 		      SOPLEX_LDFLAGS="-L$with_soplex/lib"
 		    fi
 		    SOPLEX_LIBS="-lsoplex -lz"
 		    lx_save_cxxflags="$CXXFLAGS"
 		    lx_save_ldflags="$LDFLAGS"
 		    lx_save_libs="$LIBS"
 		    CXXFLAGS="$SOPLEX_CXXFLAGS"
 		    LDFLAGS="$SOPLEX_LDFLAGS"
 		    LIBS="$SOPLEX_LIBS"
 		    lx_soplex_test_prog='
 		      #include <soplex.h>
 		      int main(int argc, char** argv)
+		      {
 		        soplex::SoPlex soplex;
 		        return 0;
 		      }'
 		    AC_LANG_PUSH(C++)
 		    AC_LINK_IFELSE([$lx_soplex_test_prog], [lx_soplex_found=yes], [lx_soplex_found=no])
 		    AC_LANG_POP(C++)
 		    CXXFLAGS="$lx_save_cxxflags"
 		    LDFLAGS="$lx_save_ldflags"
 		    LIBS="$lx_save_libs"
 		    if test x"$lx_soplex_found" = x"yes"; then
-		      AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
+		      AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
 		      lx_lp_found=yes
-		      AC_DEFINE([HAVE_LP], [1], [Define to 1 if you have any LP solver.])
+		      AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
 		      AC_MSG_RESULT([yes])
 		    else
 		      SOPLEX_CXXFLAGS=""
 		      SOPLEX_LDFLAGS=""
 		      SOPLEX_LIBS=""
 		      AC_MSG_RESULT([no])
 		    fi
 		  fi
 		  SOPLEX_LIBS="$SOPLEX_LDFLAGS $SOPLEX_LIBS"
 		  AC_SUBST(SOPLEX_CXXFLAGS)
 		  AC_SUBST(SOPLEX_LIBS)
 		  AM_CONDITIONAL([HAVE_SOPLEX], [test x"$lx_soplex_found" = x"yes"])
 		])

test/CMakeLists.txt

Show inline comments

@@ -7,103 +7,103 @@
 		SET(TESTS
 		  adaptors_test
 		  bfs_test
 		  circulation_test
 		  counter_test
 		  dfs_test
 		  digraph_test
 		  dijkstra_test
 		  dim_test
 		  edge_set_test
 		  error_test
 		  euler_test
 		  gomory_hu_test
 		  graph_copy_test
 		  graph_test
 		  graph_utils_test
 		  hao_orlin_test
 		  heap_test
 		  kruskal_test
 		  maps_test
 		  matching_test
 		  min_cost_arborescence_test
 		  min_cost_flow_test
 		  path_test
 		  preflow_test
 		  radix_sort_test
 		  random_test
 		  suurballe_test
 		  time_measure_test
 		  unionfind_test)
-		IF(HAVE_LP)
+		IF(LEMON_HAVE_LP)
 		  ADD_EXECUTABLE(lp_test lp_test.cc)
 		  SET(LP_TEST_LIBS lemon)
-		  IF(HAVE_GLPK)
+		  IF(LEMON_HAVE_GLPK)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
 		  ENDIF(HAVE_GLPK)
 		  IF(HAVE_CPLEX)
 		  ENDIF(LEMON_HAVE_GLPK)
 		  IF(LEMON_HAVE_CPLEX)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
 		  ENDIF(HAVE_CPLEX)
 		  IF(HAVE_CLP)
 		  ENDIF(LEMON_HAVE_CPLEX)
 		  IF(LEMON_HAVE_CLP)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})
-		  ENDIF(HAVE_CLP)
+		  ENDIF(LEMON_HAVE_CLP)
 		  TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
 		  ADD_TEST(lp_test lp_test)
-		  IF(WIN32 AND HAVE_GLPK)
+		  IF(WIN32 AND LEMON_HAVE_GLPK)
 		    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
 		    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
 		    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
 		      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
 		      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
 		      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
+		    )
 		  ENDIF(WIN32 AND HAVE_GLPK)
 		  IF(WIN32 AND HAVE_CPLEX)
 		  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
 		  IF(WIN32 AND LEMON_HAVE_CPLEX)
 		    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
 		    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
 		    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
 		      COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
+		    )
 		  ENDIF(WIN32 AND HAVE_CPLEX)
 		ENDIF(HAVE_LP)
 		  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
 		ENDIF(LEMON_HAVE_LP)
-		IF(HAVE_MIP)
+		IF(LEMON_HAVE_MIP)
 		  ADD_EXECUTABLE(mip_test mip_test.cc)
 		  SET(MIP_TEST_LIBS lemon)
-		  IF(HAVE_GLPK)
+		  IF(LEMON_HAVE_GLPK)
 		    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
 		  ENDIF(HAVE_GLPK)
 		  IF(HAVE_CPLEX)
 		  ENDIF(LEMON_HAVE_GLPK)
 		  IF(LEMON_HAVE_CPLEX)
 		    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
 		  ENDIF(HAVE_CPLEX)
 		  IF(HAVE_CBC)
 		  ENDIF(LEMON_HAVE_CPLEX)
 		  IF(LEMON_HAVE_CBC)
 		    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})
-		  ENDIF(HAVE_CBC)
+		  ENDIF(LEMON_HAVE_CBC)
 		  TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
 		  ADD_TEST(mip_test mip_test)
-		  IF(WIN32 AND HAVE_GLPK)
+		  IF(WIN32 AND LEMON_HAVE_GLPK)
 		    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
 		    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
 		    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
 		      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
 		      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
 		      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
+		    )
 		  ENDIF(WIN32 AND HAVE_GLPK)
 		  IF(WIN32 AND HAVE_CPLEX)
 		  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
 		  IF(WIN32 AND LEMON_HAVE_CPLEX)
 		    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
 		    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
 		    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
 		      COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
+		    )
 		  ENDIF(WIN32 AND HAVE_CPLEX)
 		ENDIF(HAVE_MIP)
 		  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
 		ENDIF(LEMON_HAVE_MIP)
 		FOREACH(TEST_NAME ${TESTS})
 		  ADD_EXECUTABLE(${TEST_NAME} ${TEST_NAME}.cc)
 		  TARGET_LINK_LIBRARIES(${TEST_NAME} lemon)
 		  ADD_TEST(${TEST_NAME} ${TEST_NAME})
 		ENDFOREACH(TEST_NAME)

test/lp_test.cc

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#include <sstream>
 		#include <lemon/lp_skeleton.h>
 		#include "test_tools.h"
 		#include <lemon/tolerance.h>
 		#ifdef HAVE_CONFIG_H
 		#include <lemon/config.h>
 		#endif
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
 		#include <lemon/glpk.h>
 		#endif
-		#ifdef HAVE_CPLEX
+		#ifdef LEMON_HAVE_CPLEX
 		#include <lemon/cplex.h>
 		#endif
-		#ifdef HAVE_SOPLEX
+		#ifdef LEMON_HAVE_SOPLEX
 		#include <lemon/soplex.h>
 		#endif
-		#ifdef HAVE_CLP
+		#ifdef LEMON_HAVE_CLP
 		#include <lemon/clp.h>
 		#endif
 		using namespace lemon;
 		void lpTest(LpSolver& lp)
+		{
 		  typedef LpSolver LP;
 		  std::vector<LP::Col> x(10);
 		  //  for(int i=0;i<10;i++) x.push_back(lp.addCol());
 		  lp.addColSet(x);
 		  lp.colLowerBound(x,1);
 		  lp.colUpperBound(x,1);
 		  lp.colBounds(x,1,2);
 		  std::vector<LP::Col> y(10);
 		  lp.addColSet(y);
 		  lp.colLowerBound(y,1);
 		  lp.colUpperBound(y,1);
 		  lp.colBounds(y,1,2);
 		  std::map<int,LP::Col> z;
 		  z.insert(std::make_pair(12,INVALID));
 		  z.insert(std::make_pair(2,INVALID));
 		  z.insert(std::make_pair(7,INVALID));
 		  z.insert(std::make_pair(5,INVALID));
 		  lp.addColSet(z);
@@ -350,72 +350,72 @@
 		  solveAndCheck(lp, LpSolver::OPTIMAL, expected_opt);
 		  //Erase one constraint and return to maximization
 		  lp.erase(upright);
 		  lp.sense(lp.MAX);
 		  expected_opt=LpSolver::INF;
 		  solveAndCheck(lp, LpSolver::UNBOUNDED, expected_opt);
 		  //Infeasibilty
 		  lp.addRow(x1+x2 <=-2);
 		  solveAndCheck(lp, LpSolver::INFEASIBLE, expected_opt);
+		}
 		template<class LP>
 		void cloneTest()
+		{
 		  //Test for clone/new
 		  LP* lp = new LP();
 		  LP* lpnew = lp->newSolver();
 		  LP* lpclone = lp->cloneSolver();
 		  delete lp;
 		  delete lpnew;
 		  delete lpclone;
+		}
 		int main()
+		{
 		  LpSkeleton lp_skel;
 		  lpTest(lp_skel);
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
+		  {
 		    GlpkLp lp_glpk1,lp_glpk2;
 		    lpTest(lp_glpk1);
 		    aTest(lp_glpk2);
 		    cloneTest<GlpkLp>();
+		  }
 		#endif
-		#ifdef HAVE_CPLEX
+		#ifdef LEMON_HAVE_CPLEX
 		  try {
 		    CplexLp lp_cplex1,lp_cplex2;
 		    lpTest(lp_cplex1);
 		    aTest(lp_cplex2);
 		    cloneTest<CplexLp>();
 		  } catch (CplexEnv::LicenseError& error) {
 		    check(false, error.what());
+		  }
 		#endif
-		#ifdef HAVE_SOPLEX
+		#ifdef LEMON_HAVE_SOPLEX
+		  {
 		    SoplexLp lp_soplex1,lp_soplex2;
 		    lpTest(lp_soplex1);
 		    aTest(lp_soplex2);
 		    cloneTest<SoplexLp>();
+		  }
 		#endif
-		#ifdef HAVE_CLP
+		#ifdef LEMON_HAVE_CLP
+		  {
 		    ClpLp lp_clp1,lp_clp2;
 		    lpTest(lp_clp1);
 		    aTest(lp_clp2);
 		    cloneTest<ClpLp>();
+		  }
 		#endif
 		  return 0;
+		}

test/mip_test.cc

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#include "test_tools.h"
 		#ifdef HAVE_CONFIG_H
 		#include <lemon/config.h>
 		#endif
-		#ifdef HAVE_CPLEX
+		#ifdef LEMON_HAVE_CPLEX
 		#include <lemon/cplex.h>
 		#endif
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
 		#include <lemon/glpk.h>
 		#endif
-		#ifdef HAVE_CBC
+		#ifdef LEMON_HAVE_CBC
 		#include <lemon/cbc.h>
 		#endif
 		using namespace lemon;
 		void solveAndCheck(MipSolver& mip, MipSolver::ProblemType stat,
 		                   double exp_opt) {
 		  using std::string;
 		  mip.solve();
 		  //int decimal,sign;
 		  std::ostringstream buf;
 		  buf << "Type should be: " << int(stat)<<" and it is "<<int(mip.type());
 		  //  itoa(stat,buf1, 10);
 		  check(mip.type()==stat, buf.str());
 		  if (stat ==  MipSolver::OPTIMAL) {
 		    std::ostringstream sbuf;
 		    buf << "Wrong optimal value: the right optimum is " << exp_opt;
 		    check(std::abs(mip.solValue()-exp_opt) < 1e-3, sbuf.str());
 		    //+ecvt(exp_opt,2)
+		  }
+		}
 		void aTest(MipSolver& mip)
+		{
 		  //The following example is very simple
@@ -100,61 +100,61 @@
 		  solveAndCheck(mip, MipSolver::OPTIMAL, expected_opt);
 		  //Restrict both to integer
 		  mip.colType(x1,MipSolver::INTEGER);
 		  expected_opt=0;
 		  solveAndCheck(mip, MipSolver::OPTIMAL, expected_opt);
 		  //Erase a variable
 		  mip.erase(x2);
 		  mip.rowUpperBound(y2, 8);
 		  expected_opt=1;
 		  solveAndCheck(mip, MipSolver::OPTIMAL, expected_opt);
+		}
 		template<class MIP>
 		void cloneTest()
+		{
 		  MIP* mip = new MIP();
 		  MIP* mipnew = mip->newSolver();
 		  MIP* mipclone = mip->cloneSolver();
 		  delete mip;
 		  delete mipnew;
 		  delete mipclone;
+		}
 		int main()
+		{
-		#ifdef HAVE_GLPK
+		#ifdef LEMON_HAVE_GLPK
+		  {
 		    GlpkMip mip1;
 		    aTest(mip1);
 		    cloneTest<GlpkMip>();
+		  }
 		#endif
-		#ifdef HAVE_CPLEX
+		#ifdef LEMON_HAVE_CPLEX
 		  try {
 		    CplexMip mip2;
 		    aTest(mip2);
 		    cloneTest<CplexMip>();
 		  } catch (CplexEnv::LicenseError& error) {
 		    check(false, error.what());
+		  }
 		#endif
-		#ifdef HAVE_CBC
+		#ifdef LEMON_HAVE_CBC
+		  {
 		    CbcMip mip1;
 		    aTest(mip1);
 		    cloneTest<CbcMip>();
+		  }
 		#endif
 		  return 0;
+		}

tools/dimacs-solver.cc

Show inline comments

@@ -171,65 +171,65 @@
 		    case DimacsDescriptor::MIN:
 		      solve_min<Value>(ap,is,os,infty,desc);
 		      break;
 		    case DimacsDescriptor::MAX:
 		      solve_max<Value>(ap,is,os,infty,desc);
 		      break;
 		    case DimacsDescriptor::SP:
 		      solve_sp<Value>(ap,is,os,desc);
 		      break;
 		    case DimacsDescriptor::MAT:
 		      solve_mat(ap,is,os,desc);
 		      break;
 		    default:
 		      break;
+		    }
+		}
 		int main(int argc, const char *argv[]) {
 		  typedef SmartDigraph Digraph;
 		  typedef Digraph::Arc Arc;
 		  std::string inputName;
 		  std::string outputName;
 		  ArgParser ap(argc, argv);
 		  ap.other("[INFILE [OUTFILE]]",
 		           "If either the INFILE or OUTFILE file is missing the standard\n"
 		           "     input/output will be used instead.")
 		    .boolOption("q", "Do not print any report")
 		    .boolOption("int","Use 'int' for capacities, costs etc. (default)")
 		    .optionGroup("datatype","int")
-		#ifdef HAVE_LONG_LONG
+		#ifdef LEMON_HAVE_LONG_LONG
 		    .boolOption("long","Use 'long long' for capacities, costs etc.")
 		    .optionGroup("datatype","long")
 		#endif
 		    .boolOption("double","Use 'double' for capacities, costs etc.")
 		    .optionGroup("datatype","double")
 		    .boolOption("ldouble","Use 'long double' for capacities, costs etc.")
 		    .optionGroup("datatype","ldouble")
 		    .onlyOneGroup("datatype")
 		    .stringOption("infcap","Value used for 'very high' capacities","0")
 		    .run();
 		  std::ifstream input;
 		  std::ofstream output;
 		  switch(ap.files().size())
+		    {
 		    case 2:
 		      output.open(ap.files()[1].c_str());
 		      if (!output) {
 		        throw IoError("Cannot open the file for writing", ap.files()[1]);
+		      }
 		    case 1:
 		      input.open(ap.files()[0].c_str());
 		      if (!input) {
 		        throw IoError("File cannot be found", ap.files()[0]);
+		      }
 		    case 0:
 		      break;
 		    default:
 		      std::cerr << ap.commandName() << ": too many arguments\n";
 		      return 1;
+		    }
@@ -238,40 +238,40 @@
 		  DimacsDescriptor desc = dimacsType(is);
 		  if(!ap.given("q"))
+		    {
 		      std::cout << "Problem type: ";
 		      switch(desc.type)
+		        {
 		        case DimacsDescriptor::MIN:
 		          std::cout << "min";
 		          break;
 		        case DimacsDescriptor::MAX:
 		          std::cout << "max";
 		          break;
 		        case DimacsDescriptor::SP:
 		          std::cout << "sp";
 		        case DimacsDescriptor::MAT:
 		          std::cout << "mat";
 		          break;
 		        default:
 		          exit(1);
 		          break;
+		        }
 		      std::cout << "\nNum of nodes: " << desc.nodeNum;
 		      std::cout << "\nNum of arcs:  " << desc.edgeNum;
 		      std::cout << "\n\n";
+		    }
 		  if(ap.given("double"))
 		    solve<double>(ap,is,os,desc);
 		  else if(ap.given("ldouble"))
 		    solve<long double>(ap,is,os,desc);
-		#ifdef HAVE_LONG_LONG
+		#ifdef LEMON_HAVE_LONG_LONG
 		  else if(ap.given("long"))
 		    solve<long long>(ap,is,os,desc);
 		#endif
 		  else solve<int>(ap,is,os,desc);
 		  return 0;
+		}

RhodeCode

Login to your account