1.1 --- a/Makefile.am Sun Jan 29 22:33:14 2012 +0100
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,80 +0,0 @@
1.4 -ACLOCAL_AMFLAGS = -I m4
1.5 -
1.6 -AM_CXXFLAGS = $(WARNINGCXXFLAGS)
1.7 -
1.8 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
1.9 -LDADD = $(top_builddir)/lemon/libemon.la
1.10 -
1.11 -EXTRA_DIST = \
1.12 - AUTHORS \
1.13 - LICENSE \
1.14 - m4/lx_check_cplex.m4 \
1.15 - m4/lx_check_glpk.m4 \
1.16 - m4/lx_check_soplex.m4 \
1.17 - m4/lx_check_coin.m4 \
1.18 - CMakeLists.txt \
1.19 - cmake/FindGhostscript.cmake \
1.20 - cmake/FindCPLEX.cmake \
1.21 - cmake/FindGLPK.cmake \
1.22 - cmake/FindCOIN.cmake \
1.23 - cmake/LEMONConfig.cmake.in \
1.24 - cmake/version.cmake.in \
1.25 - cmake/version.cmake \
1.26 - cmake/nsis/lemon.ico \
1.27 - cmake/nsis/uninstall.ico
1.28 -
1.29 -pkgconfigdir = $(libdir)/pkgconfig
1.30 -lemondir = $(pkgincludedir)
1.31 -bitsdir = $(lemondir)/bits
1.32 -conceptdir = $(lemondir)/concepts
1.33 -pkgconfig_DATA =
1.34 -lib_LTLIBRARIES =
1.35 -lemon_HEADERS =
1.36 -bits_HEADERS =
1.37 -concept_HEADERS =
1.38 -noinst_HEADERS =
1.39 -noinst_PROGRAMS =
1.40 -bin_PROGRAMS =
1.41 -check_PROGRAMS =
1.42 -dist_bin_SCRIPTS =
1.43 -TESTS =
1.44 -XFAIL_TESTS =
1.45 -
1.46 -include lemon/Makefile.am
1.47 -include test/Makefile.am
1.48 -include doc/Makefile.am
1.49 -include tools/Makefile.am
1.50 -include scripts/Makefile.am
1.51 -
1.52 -DIST_SUBDIRS = demo
1.53 -
1.54 -demo:
1.55 - $(MAKE) $(AM_MAKEFLAGS) -C demo
1.56 -
1.57 -MRPROPERFILES = \
1.58 - aclocal.m4 \
1.59 - config.h.in \
1.60 - config.h.in~ \
1.61 - configure \
1.62 - Makefile.in \
1.63 - build-aux/config.guess \
1.64 - build-aux/config.sub \
1.65 - build-aux/depcomp \
1.66 - build-aux/install-sh \
1.67 - build-aux/ltmain.sh \
1.68 - build-aux/missing \
1.69 - doc/doxygen.log
1.70 -
1.71 -mrproper:
1.72 - $(MAKE) $(AM_MAKEFLAGS) maintainer-clean
1.73 - -rm -f $(MRPROPERFILES)
1.74 -
1.75 -dist-bz2: dist
1.76 - zcat $(PACKAGE)-$(VERSION).tar.gz | \
1.77 - bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
1.78 -
1.79 -distcheck-bz2: distcheck
1.80 - zcat $(PACKAGE)-$(VERSION).tar.gz | \
1.81 - bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
1.82 -
1.83 -.PHONY: demo mrproper dist-bz2 distcheck-bz2
2.1 --- a/configure.ac Sun Jan 29 22:33:14 2012 +0100
2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2.3 @@ -1,157 +0,0 @@
2.4 -dnl Process this file with autoconf to produce a configure script.
2.5 -
2.6 -dnl Version information.
2.7 -m4_define([lemon_version_number],
2.8 - [m4_normalize(esyscmd([echo ${LEMON_VERSION}]))])
2.9 -dnl m4_define([lemon_version_number], [])
2.10 -m4_define([lemon_hg_path], [m4_normalize(esyscmd([./scripts/chg-len.py]))])
2.11 -m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i 2> /dev/null]))])
2.12 -m4_define([lemon_version], [ifelse(lemon_version_number(),
2.13 - [],
2.14 - [ifelse(lemon_hg_revision(),
2.15 - [],
2.16 - [hg-tip],
2.17 - [lemon_hg_path().lemon_hg_revision()])],
2.18 - [lemon_version_number()])])
2.19 -
2.20 -AC_PREREQ([2.59])
2.21 -AC_INIT([LEMON], [lemon_version()], [lemon-user@lemon.cs.elte.hu], [lemon])
2.22 -AC_CONFIG_AUX_DIR([build-aux])
2.23 -AC_CONFIG_MACRO_DIR([m4])
2.24 -AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc])
2.25 -AC_CONFIG_SRCDIR([lemon/list_graph.h])
2.26 -AC_CONFIG_HEADERS([config.h lemon/config.h])
2.27 -
2.28 -AC_DEFINE([LEMON_VERSION], [lemon_version()], [The version string])
2.29 -
2.30 -dnl Do compilation tests using the C++ compiler.
2.31 -AC_LANG([C++])
2.32 -
2.33 -dnl Check the existence of long long type.
2.34 -AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])
2.35 -if test x"$long_long_found" = x"yes"; then
2.36 - AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
2.37 -fi
2.38 -
2.39 -dnl Checks for programs.
2.40 -AC_PROG_CXX
2.41 -AC_PROG_CXXCPP
2.42 -AC_PROG_INSTALL
2.43 -AC_DISABLE_SHARED
2.44 -AC_PROG_LIBTOOL
2.45 -
2.46 -AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no])
2.47 -AC_CHECK_PROG([python_found],[python],[yes],[no])
2.48 -AC_CHECK_PROG([gs_found],[gs],[yes],[no])
2.49 -
2.50 -dnl Detect Intel compiler.
2.51 -AC_MSG_CHECKING([whether we are using the Intel C++ compiler])
2.52 -AC_COMPILE_IFELSE([#ifndef __INTEL_COMPILER
2.53 -choke me
2.54 -#endif], [ICC=[yes]], [ICC=[no]])
2.55 -if test x"$ICC" = x"yes"; then
2.56 - AC_MSG_RESULT([yes])
2.57 -else
2.58 - AC_MSG_RESULT([no])
2.59 -fi
2.60 -
2.61 -dnl Set custom compiler flags when using g++.
2.62 -if test "$GXX" = yes -a "$ICC" = no; then
2.63 - 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"
2.64 -fi
2.65 -AC_SUBST([WARNINGCXXFLAGS])
2.66 -
2.67 -dnl Checks for libraries.
2.68 -LX_CHECK_GLPK
2.69 -LX_CHECK_CPLEX
2.70 -LX_CHECK_SOPLEX
2.71 -LX_CHECK_COIN
2.72 -
2.73 -AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"])
2.74 -AM_CONDITIONAL([HAVE_MIP], [test x"$lx_mip_found" = x"yes"])
2.75 -
2.76 -dnl Disable/enable building the binary tools.
2.77 -AC_ARG_ENABLE([tools],
2.78 -AS_HELP_STRING([--enable-tools], [build additional tools @<:@default@:>@])
2.79 -AS_HELP_STRING([--disable-tools], [do not build additional tools]),
2.80 - [], [enable_tools=yes])
2.81 -AC_MSG_CHECKING([whether to build the additional tools])
2.82 -if test x"$enable_tools" != x"no"; then
2.83 - AC_MSG_RESULT([yes])
2.84 -else
2.85 - AC_MSG_RESULT([no])
2.86 -fi
2.87 -AM_CONDITIONAL([WANT_TOOLS], [test x"$enable_tools" != x"no"])
2.88 -
2.89 -dnl Support for running test cases using valgrind.
2.90 -use_valgrind=no
2.91 -AC_ARG_ENABLE([valgrind],
2.92 -AS_HELP_STRING([--enable-valgrind], [use valgrind when running tests]),
2.93 - [use_valgrind=yes])
2.94 -
2.95 -if [[ "$use_valgrind" = "yes" ]]; then
2.96 - AC_CHECK_PROG(HAVE_VALGRIND, valgrind, yes, no)
2.97 -
2.98 - if [[ "$HAVE_VALGRIND" = "no" ]]; then
2.99 - AC_MSG_ERROR([Valgrind not found in PATH.])
2.100 - fi
2.101 -fi
2.102 -AM_CONDITIONAL(USE_VALGRIND, [test "$use_valgrind" = "yes"])
2.103 -
2.104 -dnl Checks for header files.
2.105 -AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
2.106 -
2.107 -dnl Checks for typedefs, structures, and compiler characteristics.
2.108 -AC_C_CONST
2.109 -AC_C_INLINE
2.110 -AC_TYPE_SIZE_T
2.111 -AC_HEADER_TIME
2.112 -AC_STRUCT_TM
2.113 -
2.114 -dnl Checks for library functions.
2.115 -AC_HEADER_STDC
2.116 -AC_CHECK_FUNCS(gettimeofday times ctime_r)
2.117 -
2.118 -dnl Add dependencies on files generated by configure.
2.119 -AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
2.120 - ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/doc/mainpage.dox.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
2.121 -
2.122 -AC_CONFIG_FILES([
2.123 -Makefile
2.124 -demo/Makefile
2.125 -cmake/version.cmake
2.126 -doc/Doxyfile
2.127 -doc/mainpage.dox
2.128 -lemon/lemon.pc
2.129 -])
2.130 -
2.131 -AC_OUTPUT
2.132 -
2.133 -echo
2.134 -echo '****************************** SUMMARY ******************************'
2.135 -echo
2.136 -echo Package version............... : $PACKAGE-$VERSION
2.137 -echo
2.138 -echo C++ compiler.................. : $CXX
2.139 -echo C++ compiles flags............ : $WARNINGCXXFLAGS $CXXFLAGS
2.140 -echo
2.141 -echo Compiler supports long long... : $long_long_found
2.142 -echo
2.143 -echo GLPK support.................. : $lx_glpk_found
2.144 -echo CPLEX support................. : $lx_cplex_found
2.145 -echo SOPLEX support................ : $lx_soplex_found
2.146 -echo CLP support................... : $lx_clp_found
2.147 -echo CBC support................... : $lx_cbc_found
2.148 -echo
2.149 -echo Build additional tools........ : $enable_tools
2.150 -echo Use valgrind for tests........ : $use_valgrind
2.151 -echo
2.152 -echo The packace will be installed in
2.153 -echo -n ' '
2.154 -echo $prefix.
2.155 -echo
2.156 -echo '*********************************************************************'
2.157 -
2.158 -echo
2.159 -echo Configure complete, now type \'make\' and then \'make install\'.
2.160 -echo
3.1 --- a/demo/Makefile.am Sun Jan 29 22:33:14 2012 +0100
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,17 +0,0 @@
3.4 -AM_CXXFLAGS = $(WARNINGCXXFLAGS)
3.5 -
3.6 -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
3.7 -LDADD = $(top_builddir)/lemon/libemon.la
3.8 -
3.9 -EXTRA_DIST = \
3.10 - CMakeLists.txt \
3.11 - digraph.lgf
3.12 -
3.13 -noinst_PROGRAMS = \
3.14 - arg_parser_demo \
3.15 - graph_to_eps_demo \
3.16 - lgf_demo
3.17 -
3.18 -arg_parser_demo_SOURCES = arg_parser_demo.cc
3.19 -graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc
3.20 -lgf_demo_SOURCES = lgf_demo.cc
4.1 --- a/doc/Makefile.am Sun Jan 29 22:33:14 2012 +0100
4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
4.3 @@ -1,125 +0,0 @@
4.4 -EXTRA_DIST += \
4.5 - doc/Doxyfile.in \
4.6 - doc/DoxygenLayout.xml \
4.7 - doc/coding_style.dox \
4.8 - doc/dirs.dox \
4.9 - doc/groups.dox \
4.10 - doc/lgf.dox \
4.11 - doc/license.dox \
4.12 - doc/mainpage.dox \
4.13 - doc/migration.dox \
4.14 - doc/min_cost_flow.dox \
4.15 - doc/named-param.dox \
4.16 - doc/namespaces.dox \
4.17 - doc/references.bib \
4.18 - doc/template.h \
4.19 - doc/html \
4.20 - doc/CMakeLists.txt
4.21 -
4.22 -DOC_EPS_IMAGES18 = \
4.23 - grid_graph.eps \
4.24 - nodeshape_0.eps \
4.25 - nodeshape_1.eps \
4.26 - nodeshape_2.eps \
4.27 - nodeshape_3.eps \
4.28 - nodeshape_4.eps
4.29 -
4.30 -DOC_EPS_IMAGES27 = \
4.31 - bipartite_matching.eps \
4.32 - bipartite_partitions.eps \
4.33 - connected_components.eps \
4.34 - edge_biconnected_components.eps \
4.35 - matching.eps \
4.36 - node_biconnected_components.eps \
4.37 - planar.eps \
4.38 - strongly_connected_components.eps
4.39 -
4.40 -DOC_EPS_IMAGES = \
4.41 - $(DOC_EPS_IMAGES18) \
4.42 - $(DOC_EPS_IMAGES27)
4.43 -
4.44 -DOC_PNG_IMAGES = \
4.45 - $(DOC_EPS_IMAGES:%.eps=doc/gen-images/%.png)
4.46 -
4.47 -EXTRA_DIST += $(DOC_EPS_IMAGES:%=doc/images/%)
4.48 -
4.49 -doc/html:
4.50 - $(MAKE) $(AM_MAKEFLAGS) html
4.51 -
4.52 -GS_COMMAND=gs -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4
4.53 -
4.54 -$(DOC_EPS_IMAGES18:%.eps=doc/gen-images/%.png): doc/gen-images/%.png: doc/images/%.eps
4.55 - -mkdir doc/gen-images
4.56 - if test ${gs_found} = yes; then \
4.57 - $(GS_COMMAND) -sDEVICE=pngalpha -r18 -sOutputFile=$@ $<; \
4.58 - else \
4.59 - echo; \
4.60 - echo "Ghostscript not found."; \
4.61 - echo; \
4.62 - exit 1; \
4.63 - fi
4.64 -
4.65 -$(DOC_EPS_IMAGES27:%.eps=doc/gen-images/%.png): doc/gen-images/%.png: doc/images/%.eps
4.66 - -mkdir doc/gen-images
4.67 - if test ${gs_found} = yes; then \
4.68 - $(GS_COMMAND) -sDEVICE=pngalpha -r27 -sOutputFile=$@ $<; \
4.69 - else \
4.70 - echo; \
4.71 - echo "Ghostscript not found."; \
4.72 - echo; \
4.73 - exit 1; \
4.74 - fi
4.75 -
4.76 -references.dox: doc/references.bib
4.77 - if test ${python_found} = yes; then \
4.78 - cd doc; \
4.79 - python @abs_top_srcdir@/scripts/bib2dox.py @abs_top_builddir@/$< >$@; \
4.80 - cd ..; \
4.81 - else \
4.82 - echo; \
4.83 - echo "Python not found."; \
4.84 - echo; \
4.85 - exit 1; \
4.86 - fi
4.87 -
4.88 -html-local: $(DOC_PNG_IMAGES) references.dox
4.89 - if test ${doxygen_found} = yes; then \
4.90 - cd doc; \
4.91 - doxygen Doxyfile; \
4.92 - cd ..; \
4.93 - else \
4.94 - echo; \
4.95 - echo "Doxygen not found."; \
4.96 - echo; \
4.97 - exit 1; \
4.98 - fi
4.99 -
4.100 -clean-local:
4.101 - -rm -rf doc/html
4.102 - -rm -f doc/doxygen.log
4.103 - -rm -f $(DOC_PNG_IMAGES)
4.104 - -rm -rf doc/gen-images
4.105 -
4.106 -update-external-tags:
4.107 - wget -O doc/libstdc++.tag.tmp http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag && \
4.108 - mv doc/libstdc++.tag.tmp doc/libstdc++.tag || \
4.109 - rm doc/libstdc++.tag.tmp
4.110 -
4.111 -install-html-local: doc/html
4.112 - @$(NORMAL_INSTALL)
4.113 - $(mkinstalldirs) $(DESTDIR)$(htmldir)/html
4.114 - for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
4.115 - f="`echo $$p | sed -e 's|^.*/||'`"; \
4.116 - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f"; \
4.117 - $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f; \
4.118 - done
4.119 -
4.120 -uninstall-local:
4.121 - @$(NORMAL_UNINSTALL)
4.122 - for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
4.123 - f="`echo $$p | sed -e 's|^.*/||'`"; \
4.124 - echo " rm -f $(DESTDIR)$(htmldir)/html/$$f"; \
4.125 - rm -f $(DESTDIR)$(htmldir)/html/$$f; \
4.126 - done
4.127 -
4.128 -.PHONY: update-external-tags
5.1 --- a/lemon/CMakeLists.txt Sun Jan 29 22:33:14 2012 +0100
5.2 +++ b/lemon/CMakeLists.txt Mon Jan 30 10:54:49 2012 +0100
5.3 @@ -4,12 +4,12 @@
5.4 )
5.5
5.6 CONFIGURE_FILE(
5.7 - ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
5.8 + ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
5.9 ${CMAKE_CURRENT_BINARY_DIR}/config.h
5.10 )
5.11
5.12 CONFIGURE_FILE(
5.13 - ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.cmake
5.14 + ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.in
5.15 ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
5.16 @ONLY
5.17 )
6.1 --- a/lemon/Makefile.am Sun Jan 29 22:33:14 2012 +0100
6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
6.3 @@ -1,155 +0,0 @@
6.4 -EXTRA_DIST += \
6.5 - lemon/lemon.pc.in \
6.6 - lemon/lemon.pc.cmake \
6.7 - lemon/CMakeLists.txt \
6.8 - lemon/config.h.cmake
6.9 -
6.10 -pkgconfig_DATA += lemon/lemon.pc
6.11 -
6.12 -lib_LTLIBRARIES += lemon/libemon.la
6.13 -
6.14 -lemon_libemon_la_SOURCES = \
6.15 - lemon/arg_parser.cc \
6.16 - lemon/base.cc \
6.17 - lemon/color.cc \
6.18 - lemon/lp_base.cc \
6.19 - lemon/lp_skeleton.cc \
6.20 - lemon/random.cc \
6.21 - lemon/bits/windows.cc
6.22 -
6.23 -nodist_lemon_HEADERS = lemon/config.h
6.24 -
6.25 -lemon_libemon_la_CXXFLAGS = \
6.26 - $(AM_CXXFLAGS) \
6.27 - $(GLPK_CFLAGS) \
6.28 - $(CPLEX_CFLAGS) \
6.29 - $(SOPLEX_CXXFLAGS) \
6.30 - $(CLP_CXXFLAGS) \
6.31 - $(CBC_CXXFLAGS)
6.32 -
6.33 -lemon_libemon_la_LDFLAGS = \
6.34 - $(GLPK_LIBS) \
6.35 - $(CPLEX_LIBS) \
6.36 - $(SOPLEX_LIBS) \
6.37 - $(CLP_LIBS) \
6.38 - $(CBC_LIBS)
6.39 -
6.40 -if HAVE_GLPK
6.41 -lemon_libemon_la_SOURCES += lemon/glpk.cc
6.42 -endif
6.43 -
6.44 -if HAVE_CPLEX
6.45 -lemon_libemon_la_SOURCES += lemon/cplex.cc
6.46 -endif
6.47 -
6.48 -if HAVE_SOPLEX
6.49 -lemon_libemon_la_SOURCES += lemon/soplex.cc
6.50 -endif
6.51 -
6.52 -if HAVE_CLP
6.53 -lemon_libemon_la_SOURCES += lemon/clp.cc
6.54 -endif
6.55 -
6.56 -if HAVE_CBC
6.57 -lemon_libemon_la_SOURCES += lemon/cbc.cc
6.58 -endif
6.59 -
6.60 -lemon_HEADERS += \
6.61 - lemon/adaptors.h \
6.62 - lemon/arg_parser.h \
6.63 - lemon/assert.h \
6.64 - lemon/bellman_ford.h \
6.65 - lemon/bfs.h \
6.66 - lemon/bin_heap.h \
6.67 - lemon/binomial_heap.h \
6.68 - lemon/bucket_heap.h \
6.69 - lemon/capacity_scaling.h \
6.70 - lemon/cbc.h \
6.71 - lemon/circulation.h \
6.72 - lemon/clp.h \
6.73 - lemon/color.h \
6.74 - lemon/concept_check.h \
6.75 - lemon/connectivity.h \
6.76 - lemon/core.h \
6.77 - lemon/cost_scaling.h \
6.78 - lemon/counter.h \
6.79 - lemon/cplex.h \
6.80 - lemon/cycle_canceling.h \
6.81 - lemon/dfs.h \
6.82 - lemon/dheap.h \
6.83 - lemon/dijkstra.h \
6.84 - lemon/dim2.h \
6.85 - lemon/dimacs.h \
6.86 - lemon/edge_set.h \
6.87 - lemon/elevator.h \
6.88 - lemon/error.h \
6.89 - lemon/euler.h \
6.90 - lemon/fib_heap.h \
6.91 - lemon/fractional_matching.h \
6.92 - lemon/full_graph.h \
6.93 - lemon/glpk.h \
6.94 - lemon/gomory_hu.h \
6.95 - lemon/graph_to_eps.h \
6.96 - lemon/grid_graph.h \
6.97 - lemon/grosso_locatelli_pullan_mc.h \
6.98 - lemon/hartmann_orlin_mmc.h \
6.99 - lemon/howard_mmc.h \
6.100 - lemon/hypercube_graph.h \
6.101 - lemon/karp_mmc.h \
6.102 - lemon/kruskal.h \
6.103 - lemon/hao_orlin.h \
6.104 - lemon/lgf_reader.h \
6.105 - lemon/lgf_writer.h \
6.106 - lemon/list_graph.h \
6.107 - lemon/lp.h \
6.108 - lemon/lp_base.h \
6.109 - lemon/lp_skeleton.h \
6.110 - lemon/maps.h \
6.111 - lemon/matching.h \
6.112 - lemon/math.h \
6.113 - lemon/min_cost_arborescence.h \
6.114 - lemon/max_cardinality_search.h \
6.115 - lemon/nagamochi_ibaraki.h \
6.116 - lemon/nauty_reader.h \
6.117 - lemon/network_simplex.h \
6.118 - lemon/pairing_heap.h \
6.119 - lemon/path.h \
6.120 - lemon/planarity.h \
6.121 - lemon/preflow.h \
6.122 - lemon/quad_heap.h \
6.123 - lemon/radix_heap.h \
6.124 - lemon/radix_sort.h \
6.125 - lemon/random.h \
6.126 - lemon/smart_graph.h \
6.127 - lemon/soplex.h \
6.128 - lemon/static_graph.h \
6.129 - lemon/suurballe.h \
6.130 - lemon/time_measure.h \
6.131 - lemon/tolerance.h \
6.132 - lemon/unionfind.h \
6.133 - lemon/bits/windows.h
6.134 -
6.135 -bits_HEADERS += \
6.136 - lemon/bits/alteration_notifier.h \
6.137 - lemon/bits/array_map.h \
6.138 - lemon/bits/bezier.h \
6.139 - lemon/bits/default_map.h \
6.140 - lemon/bits/edge_set_extender.h \
6.141 - lemon/bits/enable_if.h \
6.142 - lemon/bits/graph_adaptor_extender.h \
6.143 - lemon/bits/graph_extender.h \
6.144 - lemon/bits/lock.h \
6.145 - lemon/bits/map_extender.h \
6.146 - lemon/bits/path_dump.h \
6.147 - lemon/bits/solver_bits.h \
6.148 - lemon/bits/traits.h \
6.149 - lemon/bits/variant.h \
6.150 - lemon/bits/vector_map.h
6.151 -
6.152 -concept_HEADERS += \
6.153 - lemon/concepts/digraph.h \
6.154 - lemon/concepts/graph.h \
6.155 - lemon/concepts/graph_components.h \
6.156 - lemon/concepts/heap.h \
6.157 - lemon/concepts/maps.h \
6.158 - lemon/concepts/path.h
7.1 --- a/lemon/config.h.cmake Sun Jan 29 22:33:14 2012 +0100
7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
7.3 @@ -1,10 +0,0 @@
7.4 -#define LEMON_VERSION "@PROJECT_VERSION@"
7.5 -#cmakedefine LEMON_HAVE_LONG_LONG 1
7.6 -#cmakedefine LEMON_HAVE_LP 1
7.7 -#cmakedefine LEMON_HAVE_MIP 1
7.8 -#cmakedefine LEMON_HAVE_GLPK 1
7.9 -#cmakedefine LEMON_HAVE_CPLEX 1
7.10 -#cmakedefine LEMON_HAVE_CLP 1
7.11 -#cmakedefine LEMON_HAVE_CBC 1
7.12 -#cmakedefine LEMON_USE_PTHREAD 1
7.13 -#cmakedefine LEMON_USE_WIN32_THREADS 1
8.1 --- a/lemon/config.h.in Sun Jan 29 22:33:14 2012 +0100
8.2 +++ b/lemon/config.h.in Mon Jan 30 10:54:49 2012 +0100
8.3 @@ -1,32 +1,10 @@
8.4 -/* The version string */
8.5 -#undef LEMON_VERSION
8.6 -
8.7 -/* Define to 1 if you have long long */
8.8 -#undef LEMON_HAVE_LONG_LONG
8.9 -
8.10 -/* Define to 1 if you have any LP solver. */
8.11 -#undef LEMON_HAVE_LP
8.12 -
8.13 -/* Define to 1 if you have any MIP solver. */
8.14 -#undef LEMON_HAVE_MIP
8.15 -
8.16 -/* Define to 1 if you have CPLEX. */
8.17 -#undef LEMON_HAVE_CPLEX
8.18 -
8.19 -/* Define to 1 if you have GLPK. */
8.20 -#undef LEMON_HAVE_GLPK
8.21 -
8.22 -/* Define to 1 if you have SOPLEX */
8.23 -#undef LEMON_HAVE_SOPLEX
8.24 -
8.25 -/* Define to 1 if you have CLP */
8.26 -#undef LEMON_HAVE_CLP
8.27 -
8.28 -/* Define to 1 if you have CBC */
8.29 -#undef LEMON_HAVE_CBC
8.30 -
8.31 -/* Define to 1 if you have pthread */
8.32 -#undef LEMON_USE_PTHREAD
8.33 -
8.34 -/* Define to 1 if you have win32 threads */
8.35 -#undef LEMON_USE_WIN32_THREADS
8.36 +#define LEMON_VERSION "@PROJECT_VERSION@"
8.37 +#cmakedefine LEMON_HAVE_LONG_LONG 1
8.38 +#cmakedefine LEMON_HAVE_LP 1
8.39 +#cmakedefine LEMON_HAVE_MIP 1
8.40 +#cmakedefine LEMON_HAVE_GLPK 1
8.41 +#cmakedefine LEMON_HAVE_CPLEX 1
8.42 +#cmakedefine LEMON_HAVE_CLP 1
8.43 +#cmakedefine LEMON_HAVE_CBC 1
8.44 +#cmakedefine LEMON_USE_PTHREAD 1
8.45 +#cmakedefine LEMON_USE_WIN32_THREADS 1
9.1 --- a/lemon/lemon.pc.cmake Sun Jan 29 22:33:14 2012 +0100
9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
9.3 @@ -1,10 +0,0 @@
9.4 -prefix=@CMAKE_INSTALL_PREFIX@
9.5 -exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
9.6 -libdir=@CMAKE_INSTALL_PREFIX@/lib
9.7 -includedir=@CMAKE_INSTALL_PREFIX@/include
9.8 -
9.9 -Name: @PROJECT_NAME@
9.10 -Description: Library for Efficient Modeling and Optimization in Networks
9.11 -Version: @PROJECT_VERSION@
9.12 -Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@ @SOPLEX_LIBS@ @CLP_LIBS@ @CBC_LIBS@
9.13 -Cflags: -I${includedir}
10.1 --- a/lemon/lemon.pc.in Sun Jan 29 22:33:14 2012 +0100
10.2 +++ b/lemon/lemon.pc.in Mon Jan 30 10:54:49 2012 +0100
10.3 @@ -1,10 +1,10 @@
10.4 -prefix=@prefix@
10.5 -exec_prefix=@exec_prefix@
10.6 -libdir=@libdir@
10.7 -includedir=@includedir@
10.8 +prefix=@CMAKE_INSTALL_PREFIX@
10.9 +exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
10.10 +libdir=@CMAKE_INSTALL_PREFIX@/lib
10.11 +includedir=@CMAKE_INSTALL_PREFIX@/include
10.12
10.13 -Name: @PACKAGE_NAME@
10.14 +Name: @PROJECT_NAME@
10.15 Description: Library for Efficient Modeling and Optimization in Networks
10.16 -Version: @PACKAGE_VERSION@
10.17 +Version: @PROJECT_VERSION@
10.18 Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@ @SOPLEX_LIBS@ @CLP_LIBS@ @CBC_LIBS@
10.19 Cflags: -I${includedir}
11.1 --- a/m4/lx_check_coin.m4 Sun Jan 29 22:33:14 2012 +0100
11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
11.3 @@ -1,136 +0,0 @@
11.4 -AC_DEFUN([LX_CHECK_COIN],
11.5 -[
11.6 - AC_ARG_WITH([coin],
11.7 -AS_HELP_STRING([--with-coin@<:@=PREFIX@:>@], [search for CLP under PREFIX or under the default search paths if PREFIX is not given @<:@default@:>@])
11.8 -AS_HELP_STRING([--without-coin], [disable checking for CLP]),
11.9 - [], [with_coin=yes])
11.10 -
11.11 - AC_ARG_WITH([coin-includedir],
11.12 -AS_HELP_STRING([--with-coin-includedir=DIR], [search for CLP headers in DIR]),
11.13 - [], [with_coin_includedir=no])
11.14 -
11.15 - AC_ARG_WITH([coin-libdir],
11.16 -AS_HELP_STRING([--with-coin-libdir=DIR], [search for CLP libraries in DIR]),
11.17 - [], [with_coin_libdir=no])
11.18 -
11.19 - lx_clp_found=no
11.20 - if test x"$with_coin" != x"no"; then
11.21 - AC_MSG_CHECKING([for CLP])
11.22 -
11.23 - if test x"$with_coin_includedir" != x"no"; then
11.24 - CLP_CXXFLAGS="-I$with_coin_includedir"
11.25 - elif test x"$with_coin" != x"yes"; then
11.26 - CLP_CXXFLAGS="-I$with_coin/include"
11.27 - fi
11.28 -
11.29 - if test x"$with_coin_libdir" != x"no"; then
11.30 - CLP_LDFLAGS="-L$with_coin_libdir"
11.31 - elif test x"$with_coin" != x"yes"; then
11.32 - CLP_LDFLAGS="-L$with_coin/lib"
11.33 - fi
11.34 - CLP_LIBS="-lClp -lCoinUtils -lm"
11.35 -
11.36 - lx_save_cxxflags="$CXXFLAGS"
11.37 - lx_save_ldflags="$LDFLAGS"
11.38 - lx_save_libs="$LIBS"
11.39 - CXXFLAGS="$CLP_CXXFLAGS"
11.40 - LDFLAGS="$CLP_LDFLAGS"
11.41 - LIBS="$CLP_LIBS"
11.42 -
11.43 - lx_clp_test_prog='
11.44 - #include <coin/ClpModel.hpp>
11.45 -
11.46 - int main(int argc, char** argv)
11.47 - {
11.48 - ClpModel clp;
11.49 - return 0;
11.50 - }'
11.51 -
11.52 - AC_LANG_PUSH(C++)
11.53 - AC_LINK_IFELSE([$lx_clp_test_prog], [lx_clp_found=yes], [lx_clp_found=no])
11.54 - AC_LANG_POP(C++)
11.55 -
11.56 - CXXFLAGS="$lx_save_cxxflags"
11.57 - LDFLAGS="$lx_save_ldflags"
11.58 - LIBS="$lx_save_libs"
11.59 -
11.60 - if test x"$lx_clp_found" = x"yes"; then
11.61 - AC_DEFINE([LEMON_HAVE_CLP], [1], [Define to 1 if you have CLP.])
11.62 - lx_lp_found=yes
11.63 - AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
11.64 - AC_MSG_RESULT([yes])
11.65 - else
11.66 - CLP_CXXFLAGS=""
11.67 - CLP_LDFLAGS=""
11.68 - CLP_LIBS=""
11.69 - AC_MSG_RESULT([no])
11.70 - fi
11.71 - fi
11.72 - CLP_LIBS="$CLP_LDFLAGS $CLP_LIBS"
11.73 - AC_SUBST(CLP_CXXFLAGS)
11.74 - AC_SUBST(CLP_LIBS)
11.75 - AM_CONDITIONAL([HAVE_CLP], [test x"$lx_clp_found" = x"yes"])
11.76 -
11.77 -
11.78 - lx_cbc_found=no
11.79 - if test x"$lx_clp_found" = x"yes"; then
11.80 - if test x"$with_coin" != x"no"; then
11.81 - AC_MSG_CHECKING([for CBC])
11.82 -
11.83 - if test x"$with_coin_includedir" != x"no"; then
11.84 - CBC_CXXFLAGS="-I$with_coin_includedir"
11.85 - elif test x"$with_coin" != x"yes"; then
11.86 - CBC_CXXFLAGS="-I$with_coin/include"
11.87 - fi
11.88 -
11.89 - if test x"$with_coin_libdir" != x"no"; then
11.90 - CBC_LDFLAGS="-L$with_coin_libdir"
11.91 - elif test x"$with_coin" != x"yes"; then
11.92 - CBC_LDFLAGS="-L$with_coin/lib"
11.93 - fi
11.94 - CBC_LIBS="-lOsi -lCbc -lCbcSolver -lClp -lOsiClp -lCoinUtils -lVol -lOsiVol -lCgl -lm -llapack -lblas"
11.95 -
11.96 - lx_save_cxxflags="$CXXFLAGS"
11.97 - lx_save_ldflags="$LDFLAGS"
11.98 - lx_save_libs="$LIBS"
11.99 - CXXFLAGS="$CBC_CXXFLAGS"
11.100 - LDFLAGS="$CBC_LDFLAGS"
11.101 - LIBS="$CBC_LIBS"
11.102 -
11.103 - lx_cbc_test_prog='
11.104 - #include <coin/CbcModel.hpp>
11.105 -
11.106 - int main(int argc, char** argv)
11.107 - {
11.108 - CbcModel cbc;
11.109 - return 0;
11.110 - }'
11.111 -
11.112 - AC_LANG_PUSH(C++)
11.113 - AC_LINK_IFELSE([$lx_cbc_test_prog], [lx_cbc_found=yes], [lx_cbc_found=no])
11.114 - AC_LANG_POP(C++)
11.115 -
11.116 - CXXFLAGS="$lx_save_cxxflags"
11.117 - LDFLAGS="$lx_save_ldflags"
11.118 - LIBS="$lx_save_libs"
11.119 -
11.120 - if test x"$lx_cbc_found" = x"yes"; then
11.121 - AC_DEFINE([LEMON_HAVE_CBC], [1], [Define to 1 if you have CBC.])
11.122 - lx_lp_found=yes
11.123 - AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
11.124 - lx_mip_found=yes
11.125 - AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
11.126 - AC_MSG_RESULT([yes])
11.127 - else
11.128 - CBC_CXXFLAGS=""
11.129 - CBC_LDFLAGS=""
11.130 - CBC_LIBS=""
11.131 - AC_MSG_RESULT([no])
11.132 - fi
11.133 - fi
11.134 - fi
11.135 - CBC_LIBS="$CBC_LDFLAGS $CBC_LIBS"
11.136 - AC_SUBST(CBC_CXXFLAGS)
11.137 - AC_SUBST(CBC_LIBS)
11.138 - AM_CONDITIONAL([HAVE_CBC], [test x"$lx_cbc_found" = x"yes"])
11.139 -])
12.1 --- a/m4/lx_check_cplex.m4 Sun Jan 29 22:33:14 2012 +0100
12.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
12.3 @@ -1,81 +0,0 @@
12.4 -AC_DEFUN([LX_CHECK_CPLEX],
12.5 -[
12.6 - AC_ARG_WITH([cplex],
12.7 -AS_HELP_STRING([--with-cplex@<:@=PREFIX@:>@], [search for CPLEX under PREFIX or under the default search paths if PREFIX is not given @<:@default@:>@])
12.8 -AS_HELP_STRING([--without-cplex], [disable checking for CPLEX]),
12.9 - [], [with_cplex=yes])
12.10 -
12.11 - AC_ARG_WITH([cplex-includedir],
12.12 -AS_HELP_STRING([--with-cplex-includedir=DIR], [search for CPLEX headers in DIR]),
12.13 - [], [with_cplex_includedir=no])
12.14 -
12.15 - AC_ARG_WITH([cplex-libdir],
12.16 -AS_HELP_STRING([--with-cplex-libdir=DIR], [search for CPLEX libraries in DIR]),
12.17 - [], [with_cplex_libdir=no])
12.18 -
12.19 - lx_cplex_found=no
12.20 - if test x"$with_cplex" != x"no"; then
12.21 - AC_MSG_CHECKING([for CPLEX])
12.22 -
12.23 - if test x"$with_cplex_includedir" != x"no"; then
12.24 - CPLEX_CFLAGS="-I$with_cplex_includedir"
12.25 - elif test x"$with_cplex" != x"yes"; then
12.26 - CPLEX_CFLAGS="-I$with_cplex/include"
12.27 - elif test x"$CPLEX_INCLUDEDIR" != x; then
12.28 - CPLEX_CFLAGS="-I$CPLEX_INCLUDEDIR"
12.29 - fi
12.30 -
12.31 - if test x"$with_cplex_libdir" != x"no"; then
12.32 - CPLEX_LDFLAGS="-L$with_cplex_libdir"
12.33 - elif test x"$with_cplex" != x"yes"; then
12.34 - CPLEX_LDFLAGS="-L$with_cplex/lib"
12.35 - elif test x"$CPLEX_LIBDIR" != x; then
12.36 - CPLEX_LDFLAGS="-L$CPLEX_LIBDIR"
12.37 - fi
12.38 - CPLEX_LIBS="-lcplex -lm -lpthread"
12.39 -
12.40 - lx_save_cxxflags="$CXXFLAGS"
12.41 - lx_save_ldflags="$LDFLAGS"
12.42 - lx_save_libs="$LIBS"
12.43 - CXXFLAGS="$CPLEX_CFLAGS"
12.44 - LDFLAGS="$CPLEX_LDFLAGS"
12.45 - LIBS="$CPLEX_LIBS"
12.46 -
12.47 - lx_cplex_test_prog='
12.48 - extern "C" {
12.49 - #include <ilcplex/cplex.h>
12.50 - }
12.51 -
12.52 - int main(int argc, char** argv)
12.53 - {
12.54 - CPXENVptr env = NULL;
12.55 - return 0;
12.56 - }'
12.57 -
12.58 - AC_LANG_PUSH(C++)
12.59 - AC_LINK_IFELSE([$lx_cplex_test_prog], [lx_cplex_found=yes], [lx_cplex_found=no])
12.60 - AC_LANG_POP(C++)
12.61 -
12.62 - CXXFLAGS="$lx_save_cxxflags"
12.63 - LDFLAGS="$lx_save_ldflags"
12.64 - LIBS="$lx_save_libs"
12.65 -
12.66 - if test x"$lx_cplex_found" = x"yes"; then
12.67 - AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
12.68 - lx_lp_found=yes
12.69 - AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
12.70 - lx_mip_found=yes
12.71 - AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
12.72 - AC_MSG_RESULT([yes])
12.73 - else
12.74 - CPLEX_CFLAGS=""
12.75 - CPLEX_LDFLAGS=""
12.76 - CPLEX_LIBS=""
12.77 - AC_MSG_RESULT([no])
12.78 - fi
12.79 - fi
12.80 - CPLEX_LIBS="$CPLEX_LDFLAGS $CPLEX_LIBS"
12.81 - AC_SUBST(CPLEX_CFLAGS)
12.82 - AC_SUBST(CPLEX_LIBS)
12.83 - AM_CONDITIONAL([HAVE_CPLEX], [test x"$lx_cplex_found" = x"yes"])
12.84 -])
13.1 --- a/m4/lx_check_glpk.m4 Sun Jan 29 22:33:14 2012 +0100
13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
13.3 @@ -1,84 +0,0 @@
13.4 -AC_DEFUN([LX_CHECK_GLPK],
13.5 -[
13.6 - AC_ARG_WITH([glpk],
13.7 -AS_HELP_STRING([--with-glpk@<:@=PREFIX@:>@], [search for GLPK under PREFIX or under the default search paths if PREFIX is not given @<:@default@:>@])
13.8 -AS_HELP_STRING([--without-glpk], [disable checking for GLPK]),
13.9 - [], [with_glpk=yes])
13.10 -
13.11 - AC_ARG_WITH([glpk-includedir],
13.12 -AS_HELP_STRING([--with-glpk-includedir=DIR], [search for GLPK headers in DIR]),
13.13 - [], [with_glpk_includedir=no])
13.14 -
13.15 - AC_ARG_WITH([glpk-libdir],
13.16 -AS_HELP_STRING([--with-glpk-libdir=DIR], [search for GLPK libraries in DIR]),
13.17 - [], [with_glpk_libdir=no])
13.18 -
13.19 - lx_glpk_found=no
13.20 - if test x"$with_glpk" != x"no"; then
13.21 - AC_MSG_CHECKING([for GLPK])
13.22 -
13.23 - if test x"$with_glpk_includedir" != x"no"; then
13.24 - GLPK_CFLAGS="-I$with_glpk_includedir"
13.25 - elif test x"$with_glpk" != x"yes"; then
13.26 - GLPK_CFLAGS="-I$with_glpk/include"
13.27 - fi
13.28 -
13.29 - if test x"$with_glpk_libdir" != x"no"; then
13.30 - GLPK_LDFLAGS="-L$with_glpk_libdir"
13.31 - elif test x"$with_glpk" != x"yes"; then
13.32 - GLPK_LDFLAGS="-L$with_glpk/lib"
13.33 - fi
13.34 - GLPK_LIBS="-lglpk"
13.35 -
13.36 - lx_save_cxxflags="$CXXFLAGS"
13.37 - lx_save_ldflags="$LDFLAGS"
13.38 - lx_save_libs="$LIBS"
13.39 - CXXFLAGS="$GLPK_CFLAGS"
13.40 - LDFLAGS="$GLPK_LDFLAGS"
13.41 - LIBS="$GLPK_LIBS"
13.42 -
13.43 - lx_glpk_test_prog='
13.44 - extern "C" {
13.45 - #include <glpk.h>
13.46 - }
13.47 -
13.48 - #if (GLP_MAJOR_VERSION < 4) \
13.49 - || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION < 33)
13.50 - #error Supported GLPK versions: 4.33 or above
13.51 - #endif
13.52 -
13.53 - int main(int argc, char** argv)
13.54 - {
13.55 - LPX *lp;
13.56 - lp = lpx_create_prob();
13.57 - lpx_delete_prob(lp);
13.58 - return 0;
13.59 - }'
13.60 -
13.61 - AC_LANG_PUSH(C++)
13.62 - AC_LINK_IFELSE([$lx_glpk_test_prog], [lx_glpk_found=yes], [lx_glpk_found=no])
13.63 - AC_LANG_POP(C++)
13.64 -
13.65 - CXXFLAGS="$lx_save_cxxflags"
13.66 - LDFLAGS="$lx_save_ldflags"
13.67 - LIBS="$lx_save_libs"
13.68 -
13.69 - if test x"$lx_glpk_found" = x"yes"; then
13.70 - AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
13.71 - lx_lp_found=yes
13.72 - AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
13.73 - lx_mip_found=yes
13.74 - AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.])
13.75 - AC_MSG_RESULT([yes])
13.76 - else
13.77 - GLPK_CFLAGS=""
13.78 - GLPK_LDFLAGS=""
13.79 - GLPK_LIBS=""
13.80 - AC_MSG_RESULT([no])
13.81 - fi
13.82 - fi
13.83 - GLPK_LIBS="$GLPK_LDFLAGS $GLPK_LIBS"
13.84 - AC_SUBST(GLPK_CFLAGS)
13.85 - AC_SUBST(GLPK_LIBS)
13.86 - AM_CONDITIONAL([HAVE_GLPK], [test x"$lx_glpk_found" = x"yes"])
13.87 -])
14.1 --- a/m4/lx_check_soplex.m4 Sun Jan 29 22:33:14 2012 +0100
14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
14.3 @@ -1,73 +0,0 @@
14.4 -AC_DEFUN([LX_CHECK_SOPLEX],
14.5 -[
14.6 - AC_ARG_WITH([soplex],
14.7 -AS_HELP_STRING([--with-soplex@<:@=PREFIX@:>@], [search for SOPLEX under PREFIX or under the default search paths if PREFIX is not given @<:@default@:>@])
14.8 -AS_HELP_STRING([--without-soplex], [disable checking for SOPLEX]),
14.9 - [], [with_soplex=yes])
14.10 -
14.11 - AC_ARG_WITH([soplex-includedir],
14.12 -AS_HELP_STRING([--with-soplex-includedir=DIR], [search for SOPLEX headers in DIR]),
14.13 - [], [with_soplex_includedir=no])
14.14 -
14.15 - AC_ARG_WITH([soplex-libdir],
14.16 -AS_HELP_STRING([--with-soplex-libdir=DIR], [search for SOPLEX libraries in DIR]),
14.17 - [], [with_soplex_libdir=no])
14.18 -
14.19 - lx_soplex_found=no
14.20 - if test x"$with_soplex" != x"no"; then
14.21 - AC_MSG_CHECKING([for SOPLEX])
14.22 -
14.23 - if test x"$with_soplex_includedir" != x"no"; then
14.24 - SOPLEX_CXXFLAGS="-I$with_soplex_includedir"
14.25 - elif test x"$with_soplex" != x"yes"; then
14.26 - SOPLEX_CXXFLAGS="-I$with_soplex/src"
14.27 - fi
14.28 -
14.29 - if test x"$with_soplex_libdir" != x"no"; then
14.30 - SOPLEX_LDFLAGS="-L$with_soplex_libdir"
14.31 - elif test x"$with_soplex" != x"yes"; then
14.32 - SOPLEX_LDFLAGS="-L$with_soplex/lib"
14.33 - fi
14.34 - SOPLEX_LIBS="-lsoplex -lz"
14.35 -
14.36 - lx_save_cxxflags="$CXXFLAGS"
14.37 - lx_save_ldflags="$LDFLAGS"
14.38 - lx_save_libs="$LIBS"
14.39 - CXXFLAGS="$SOPLEX_CXXFLAGS"
14.40 - LDFLAGS="$SOPLEX_LDFLAGS"
14.41 - LIBS="$SOPLEX_LIBS"
14.42 -
14.43 - lx_soplex_test_prog='
14.44 - #include <soplex.h>
14.45 -
14.46 - int main(int argc, char** argv)
14.47 - {
14.48 - soplex::SoPlex soplex;
14.49 - return 0;
14.50 - }'
14.51 -
14.52 - AC_LANG_PUSH(C++)
14.53 - AC_LINK_IFELSE([$lx_soplex_test_prog], [lx_soplex_found=yes], [lx_soplex_found=no])
14.54 - AC_LANG_POP(C++)
14.55 -
14.56 - CXXFLAGS="$lx_save_cxxflags"
14.57 - LDFLAGS="$lx_save_ldflags"
14.58 - LIBS="$lx_save_libs"
14.59 -
14.60 - if test x"$lx_soplex_found" = x"yes"; then
14.61 - AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
14.62 - lx_lp_found=yes
14.63 - AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.])
14.64 - AC_MSG_RESULT([yes])
14.65 - else
14.66 - SOPLEX_CXXFLAGS=""
14.67 - SOPLEX_LDFLAGS=""
14.68 - SOPLEX_LIBS=""
14.69 - AC_MSG_RESULT([no])
14.70 - fi
14.71 - fi
14.72 - SOPLEX_LIBS="$SOPLEX_LDFLAGS $SOPLEX_LIBS"
14.73 - AC_SUBST(SOPLEX_CXXFLAGS)
14.74 - AC_SUBST(SOPLEX_LIBS)
14.75 - AM_CONDITIONAL([HAVE_SOPLEX], [test x"$lx_soplex_found" = x"yes"])
14.76 -])
15.1 --- a/scripts/Makefile.am Sun Jan 29 22:33:14 2012 +0100
15.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
15.3 @@ -1,7 +0,0 @@
15.4 -EXTRA_DIST += \
15.5 - scripts/bib2dox.py \
15.6 - scripts/bootstrap.sh \
15.7 - scripts/chg-len.py \
15.8 - scripts/mk-release.sh \
15.9 - scripts/unify-sources.sh \
15.10 - scripts/valgrind-wrapper.sh
16.1 --- a/scripts/bootstrap.sh Sun Jan 29 22:33:14 2012 +0100
16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
16.3 @@ -1,157 +0,0 @@
16.4 -#!/bin/bash
16.5 -#
16.6 -# This file is a part of LEMON, a generic C++ optimization library.
16.7 -#
16.8 -# Copyright (C) 2003-2009
16.9 -# Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
16.10 -# (Egervary Research Group on Combinatorial Optimization, EGRES).
16.11 -#
16.12 -# Permission to use, modify and distribute this software is granted
16.13 -# provided that this copyright notice appears in all copies. For
16.14 -# precise terms see the accompanying LICENSE file.
16.15 -#
16.16 -# This software is provided "AS IS" with no warranty of any kind,
16.17 -# express or implied, and with no claim as to its suitability for any
16.18 -# purpose.
16.19 -
16.20 -
16.21 -if [ ! -f ~/.lemon-bootstrap ]; then
16.22 - echo 'Create ~/.lemon-bootstrap'.
16.23 - cat >~/.lemon-bootstrap <<EOF
16.24 -#
16.25 -# Default settings for bootstraping the LEMON source code repository
16.26 -#
16.27 -EOF
16.28 -fi
16.29 -
16.30 -source ~/.lemon-bootstrap
16.31 -if [ -f ../../../.lemon-bootstrap ]; then source ../../../.lemon-bootstrap; fi
16.32 -if [ -f ../../.lemon-bootstrap ]; then source ../../.lemon-bootstrap; fi
16.33 -if [ -f ../.lemon-bootstrap ]; then source ../.lemon-bootstrap; fi
16.34 -if [ -f ./.lemon-bootstrap ]; then source ./.lemon-bootstrap; fi
16.35 -
16.36 -
16.37 -function augment_config() {
16.38 - if [ "x${!1}" == "x" ]; then
16.39 - eval $1=$2
16.40 - echo Add "'$1'" to '~/.lemon-bootstrap'.
16.41 - echo >>~/.lemon-bootstrap
16.42 - echo $3 >>~/.lemon-bootstrap
16.43 - echo $1=$2 >>~/.lemon-bootstrap
16.44 - fi
16.45 -}
16.46 -
16.47 -augment_config LEMON_INSTALL_PREFIX /usr/local \
16.48 - "# LEMON installation prefix"
16.49 -
16.50 -augment_config GLPK_PREFIX /usr/local/ \
16.51 - "# GLPK installation root prefix"
16.52 -
16.53 -augment_config COIN_OR_PREFIX /usr/local/coin-or \
16.54 - "# COIN-OR installation root prefix (used for CLP/CBC)"
16.55 -
16.56 -augment_config SOPLEX_PREFIX /usr/local/soplex \
16.57 - "# Soplex build prefix"
16.58 -
16.59 -
16.60 -function ask() {
16.61 -echo -n "$1 [$2]? "
16.62 -read _an
16.63 -if [ "x$_an" == "x" ]; then
16.64 - ret="$2"
16.65 -else
16.66 - ret=$_an
16.67 -fi
16.68 -}
16.69 -
16.70 -function yesorno() {
16.71 - ret='rossz'
16.72 - while [ "$ret" != "y" -a "$ret" != "n" -a "$ret" != "yes" -a "$ret" != "no" ]; do
16.73 - ask "$1" "$2"
16.74 - done
16.75 - if [ "$ret" != "y" -a "$ret" != "yes" ]; then
16.76 - return 1
16.77 - else
16.78 - return 0
16.79 - fi
16.80 -}
16.81 -
16.82 -if yesorno "External build" "n"
16.83 -then
16.84 - CONFIGURE_PATH=".."
16.85 -else
16.86 - CONFIGURE_PATH="."
16.87 - if yesorno "Autoreconf" "y"
16.88 - then
16.89 - AUTORE=yes
16.90 - else
16.91 - AUTORE=no
16.92 - fi
16.93 -fi
16.94 -
16.95 -if yesorno "Optimize" "n"
16.96 -then
16.97 - opt_flags=' -O2'
16.98 -else
16.99 - opt_flags=''
16.100 -fi
16.101 -
16.102 -if yesorno "Stop on warning" "y"
16.103 -then
16.104 - werror_flags=' -Werror'
16.105 -else
16.106 - werror_flags=''
16.107 -fi
16.108 -
16.109 -cxx_flags="CXXFLAGS=-ggdb$opt_flags$werror_flags"
16.110 -
16.111 -if yesorno "Check with valgrind" "n"
16.112 -then
16.113 - valgrind_flags=' --enable-valgrind'
16.114 -else
16.115 - valgrind_flags=''
16.116 -fi
16.117 -
16.118 -if [ -f ${GLPK_PREFIX}/include/glpk.h ]; then
16.119 - if yesorno "Use GLPK" "y"
16.120 - then
16.121 - glpk_flag="--with-glpk=$GLPK_PREFIX"
16.122 - else
16.123 - glpk_flag="--without-glpk"
16.124 - fi
16.125 -else
16.126 - glpk_flag="--without-glpk"
16.127 -fi
16.128 -
16.129 -if [ -f ${COIN_OR_PREFIX}/include/coin/config_coinutils.h ]; then
16.130 - if yesorno "Use COIN-OR (CBC/CLP)" "n"
16.131 - then
16.132 - coin_flag="--with-coin=$COIN_OR_PREFIX"
16.133 - else
16.134 - coin_flag="--without-coin"
16.135 - fi
16.136 -else
16.137 - coin_flag="--without-coin"
16.138 -fi
16.139 -
16.140 -if [ -f ${SOPLEX_PREFIX}/src/soplex.h ]; then
16.141 - if yesorno "Use Soplex" "n"
16.142 - then
16.143 - soplex_flag="--with-soplex=$SOPLEX_PREFIX"
16.144 - else
16.145 - soplex_flag="--without-soplex"
16.146 - fi
16.147 -else
16.148 - soplex_flag="--without-soplex"
16.149 -fi
16.150 -
16.151 -if [ "x$AUTORE" == "xyes" ]; then
16.152 - autoreconf -vif;
16.153 -fi
16.154 -${CONFIGURE_PATH}/configure --prefix=$LEMON_INSTALL_PREFIX \
16.155 -$valgrind_flags \
16.156 -"$cxx_flags" \
16.157 -$glpk_flag \
16.158 -$coin_flag \
16.159 -$soplex_flag \
16.160 -$*
17.1 --- a/scripts/mk-release.sh Sun Jan 29 22:33:14 2012 +0100
17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
17.3 @@ -1,49 +0,0 @@
17.4 -#!/bin/bash
17.5 -#
17.6 -# This file is a part of LEMON, a generic C++ optimization library.
17.7 -#
17.8 -# Copyright (C) 2003-2009
17.9 -# Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
17.10 -# (Egervary Research Group on Combinatorial Optimization, EGRES).
17.11 -#
17.12 -# Permission to use, modify and distribute this software is granted
17.13 -# provided that this copyright notice appears in all copies. For
17.14 -# precise terms see the accompanying LICENSE file.
17.15 -#
17.16 -# This software is provided "AS IS" with no warranty of any kind,
17.17 -# express or implied, and with no claim as to its suitability for any
17.18 -# purpose.
17.19 -
17.20 -set -e
17.21 -
17.22 -if [ $# = 0 ]; then
17.23 - echo "Usage: $0 release-id"
17.24 - exit 1
17.25 -else
17.26 - export LEMON_VERSION=$1
17.27 -fi
17.28 -
17.29 -echo '*****************************************************************'
17.30 -echo ' Start making release tarballs for version '${LEMON_VERSION}
17.31 -echo '*****************************************************************'
17.32 -
17.33 -autoreconf -vif
17.34 -./configure
17.35 -
17.36 -make
17.37 -make html
17.38 -make distcheck
17.39 -tar xf lemon-${LEMON_VERSION}.tar.gz
17.40 -zip -r lemon-${LEMON_VERSION}.zip lemon-${LEMON_VERSION}
17.41 -mv lemon-${LEMON_VERSION}/doc/html lemon-doc-${LEMON_VERSION}
17.42 -tar czf lemon-doc-${LEMON_VERSION}.tar.gz lemon-doc-${LEMON_VERSION}
17.43 -zip -r lemon-doc-${LEMON_VERSION}.zip lemon-doc-${LEMON_VERSION}
17.44 -tar czf lemon-nodoc-${LEMON_VERSION}.tar.gz lemon-${LEMON_VERSION}
17.45 -zip -r lemon-nodoc-${LEMON_VERSION}.zip lemon-${LEMON_VERSION}
17.46 -hg tag -m 'LEMON '${LEMON_VERSION}' released ('$(hg par --template="{node|short}")' tagged as r'${LEMON_VERSION}')' r${LEMON_VERSION}
17.47 -
17.48 -rm -rf lemon-${LEMON_VERSION} lemon-doc-${LEMON_VERSION}
17.49 -
17.50 -echo '*****************************************************************'
17.51 -echo ' Release '${LEMON_VERSION}' has been created'
17.52 -echo '*****************************************************************'
18.1 --- a/test/Makefile.am Sun Jan 29 22:33:14 2012 +0100
18.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
18.3 @@ -1,107 +0,0 @@
18.4 -if USE_VALGRIND
18.5 -TESTS_ENVIRONMENT=$(top_srcdir)/scripts/valgrind-wrapper.sh
18.6 -endif
18.7 -
18.8 -EXTRA_DIST += \
18.9 - test/CMakeLists.txt
18.10 -
18.11 -noinst_HEADERS += \
18.12 - test/graph_test.h \
18.13 - test/test_tools.h
18.14 -
18.15 -check_PROGRAMS += \
18.16 - test/adaptors_test \
18.17 - test/bellman_ford_test \
18.18 - test/bfs_test \
18.19 - test/circulation_test \
18.20 - test/connectivity_test \
18.21 - test/counter_test \
18.22 - test/dfs_test \
18.23 - test/digraph_test \
18.24 - test/dijkstra_test \
18.25 - test/dim_test \
18.26 - test/edge_set_test \
18.27 - test/error_test \
18.28 - test/euler_test \
18.29 - test/fractional_matching_test \
18.30 - test/gomory_hu_test \
18.31 - test/graph_copy_test \
18.32 - test/graph_test \
18.33 - test/graph_utils_test \
18.34 - test/hao_orlin_test \
18.35 - test/heap_test \
18.36 - test/kruskal_test \
18.37 - test/lgf_test \
18.38 - test/maps_test \
18.39 - test/matching_test \
18.40 - test/max_cardinality_search_test \
18.41 - test/max_clique_test \
18.42 - test/min_cost_arborescence_test \
18.43 - test/min_cost_flow_test \
18.44 - test/min_mean_cycle_test \
18.45 - test/nagamochi_ibaraki_test \
18.46 - test/path_test \
18.47 - test/planarity_test \
18.48 - test/preflow_test \
18.49 - test/radix_sort_test \
18.50 - test/random_test \
18.51 - test/suurballe_test \
18.52 - test/test_tools_fail \
18.53 - test/test_tools_pass \
18.54 - test/time_measure_test \
18.55 - test/unionfind_test
18.56 -
18.57 -test_test_tools_pass_DEPENDENCIES = demo
18.58 -
18.59 -if HAVE_LP
18.60 -check_PROGRAMS += test/lp_test
18.61 -endif HAVE_LP
18.62 -if HAVE_MIP
18.63 -check_PROGRAMS += test/mip_test
18.64 -endif HAVE_MIP
18.65 -
18.66 -TESTS += $(check_PROGRAMS)
18.67 -XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
18.68 -
18.69 -test_adaptors_test_SOURCES = test/adaptors_test.cc
18.70 -test_bellman_ford_test_SOURCES = test/bellman_ford_test.cc
18.71 -test_bfs_test_SOURCES = test/bfs_test.cc
18.72 -test_circulation_test_SOURCES = test/circulation_test.cc
18.73 -test_counter_test_SOURCES = test/counter_test.cc
18.74 -test_connectivity_test_SOURCES = test/connectivity_test.cc
18.75 -test_dfs_test_SOURCES = test/dfs_test.cc
18.76 -test_digraph_test_SOURCES = test/digraph_test.cc
18.77 -test_dijkstra_test_SOURCES = test/dijkstra_test.cc
18.78 -test_dim_test_SOURCES = test/dim_test.cc
18.79 -test_edge_set_test_SOURCES = test/edge_set_test.cc
18.80 -test_error_test_SOURCES = test/error_test.cc
18.81 -test_euler_test_SOURCES = test/euler_test.cc
18.82 -test_fractional_matching_test_SOURCES = test/fractional_matching_test.cc
18.83 -test_gomory_hu_test_SOURCES = test/gomory_hu_test.cc
18.84 -test_graph_copy_test_SOURCES = test/graph_copy_test.cc
18.85 -test_graph_test_SOURCES = test/graph_test.cc
18.86 -test_graph_utils_test_SOURCES = test/graph_utils_test.cc
18.87 -test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
18.88 -test_heap_test_SOURCES = test/heap_test.cc
18.89 -test_kruskal_test_SOURCES = test/kruskal_test.cc
18.90 -test_lgf_test_SOURCES = test/lgf_test.cc
18.91 -test_lp_test_SOURCES = test/lp_test.cc
18.92 -test_maps_test_SOURCES = test/maps_test.cc
18.93 -test_mip_test_SOURCES = test/mip_test.cc
18.94 -test_matching_test_SOURCES = test/matching_test.cc
18.95 -test_max_cardinality_search_test_SOURCES = test/max_cardinality_search_test.cc
18.96 -test_max_clique_test_SOURCES = test/max_clique_test.cc
18.97 -test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
18.98 -test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
18.99 -test_min_mean_cycle_test_SOURCES = test/min_mean_cycle_test.cc
18.100 -test_nagamochi_ibaraki_test_SOURCES = test/nagamochi_ibaraki_test.cc
18.101 -test_path_test_SOURCES = test/path_test.cc
18.102 -test_planarity_test_SOURCES = test/planarity_test.cc
18.103 -test_preflow_test_SOURCES = test/preflow_test.cc
18.104 -test_radix_sort_test_SOURCES = test/radix_sort_test.cc
18.105 -test_suurballe_test_SOURCES = test/suurballe_test.cc
18.106 -test_random_test_SOURCES = test/random_test.cc
18.107 -test_test_tools_fail_SOURCES = test/test_tools_fail.cc
18.108 -test_test_tools_pass_SOURCES = test/test_tools_pass.cc
18.109 -test_time_measure_test_SOURCES = test/time_measure_test.cc
18.110 -test_unionfind_test_SOURCES = test/unionfind_test.cc
19.1 --- a/tools/Makefile.am Sun Jan 29 22:33:14 2012 +0100
19.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
19.3 @@ -1,17 +0,0 @@
19.4 -EXTRA_DIST += \
19.5 - tools/CMakeLists.txt
19.6 -
19.7 -if WANT_TOOLS
19.8 -
19.9 -bin_PROGRAMS += \
19.10 - tools/dimacs-solver \
19.11 - tools/dimacs-to-lgf \
19.12 - tools/lgf-gen
19.13 -
19.14 -dist_bin_SCRIPTS += tools/lemon-0.x-to-1.x.sh
19.15 -
19.16 -endif WANT_TOOLS
19.17 -
19.18 -tools_dimacs_solver_SOURCES = tools/dimacs-solver.cc
19.19 -tools_dimacs_to_lgf_SOURCES = tools/dimacs-to-lgf.cc
19.20 -tools_lgf_gen_SOURCES = tools/lgf-gen.cc