Changes from releases/2.9.3 at r2350 to releases/2.9.4 at r2350


Ignore:
Location:
releases/2.9.4
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • releases/2.9.4/Cbc

  • releases/2.9.4/Cbc/Makefile.in

    r2350 r2350  
    182182COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    183183COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     184COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
     185COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
    184186COIN_HAS_DYLP_FALSE = @COIN_HAS_DYLP_FALSE@
    185187COIN_HAS_DYLP_TRUE = @COIN_HAS_DYLP_TRUE@
     
    188190COIN_HAS_GRB_FALSE = @COIN_HAS_GRB_FALSE@
    189191COIN_HAS_GRB_TRUE = @COIN_HAS_GRB_TRUE@
     192COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
     193COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
    190194COIN_HAS_MIPLIB3_FALSE = @COIN_HAS_MIPLIB3_FALSE@
    191195COIN_HAS_MIPLIB3_TRUE = @COIN_HAS_MIPLIB3_TRUE@
     
    407411coin_doxy_usedot = @coin_doxy_usedot@
    408412coin_have_doxygen = @coin_have_doxygen@
     413coin_have_latex = @coin_have_latex@
    409414datadir = @datadir@
    410415exec_prefix = @exec_prefix@
     
    488493# Files that are generated and should be cleaned with make distclean
    489494DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
    490 DocFiles = README AUTHORS LICENSE
     495DocFiles = README AUTHORS LICENSE 
    491496DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     497COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
     498COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    492499all: all-recursive
    493500
     
    989996        rm -f $(addlibsdir)/cbc_addlibs.txt
    990997
    991 install-doc: $(DocFiles)
     998doxygen-docs:
     999        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     1000          if test -d "doxydoc/"; then \
     1001            doxygen doxydoc/doxygen.conf;\
     1002          fi;\
     1003        fi
     1004
     1005pdf-doxygen-docs: doxygen-docs
     1006        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     1007          if test -d "doxydoc/latex"; then \
     1008            if test "$(COIN_HAS_LATEX)" = TRUE; then \
     1009              cd doxydoc/latex;\
     1010              $(MAKE) pdf;\
     1011              cd -;\
     1012            fi;\
     1013          fi;\
     1014        fi
     1015
     1016clean-doxygen-docs:
     1017        if test -d "doxydoc/"; then \
     1018          cd doxydoc ;\
     1019          rm -rf html latex *.log *.tag;\
     1020        fi
     1021
     1022install-doxygen-docs: doxygen-docs
     1023        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     1024          if test -d "doxydoc/"; then \
     1025            test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
     1026            $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
     1027            if test -f "doxydoc/latex/refman.pdf"; then \
     1028              $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
     1029            fi;\
     1030            if test -d "doxydoc/html"; then \
     1031              test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
     1032              $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
     1033              $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
     1034            fi;\
     1035          fi;\
     1036        fi
     1037
     1038uninstall-doxygen-docs:
     1039        if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
     1040          rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
     1041        fi
     1042        if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
     1043          rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
     1044        fi
     1045
     1046all-doxygen-docs:
     1047        for dir in $(subdirs) ; do \
     1048          do_project=true;\
     1049          for proj in $(COIN_SKIP_DOXYGEN); do\
     1050            if test $$dir = $$proj; then\
     1051              do_project=false;\
     1052            fi;\
     1053          done;\
     1054          if test -r $$dir/doxydoc & $$do_project = true; then \
     1055            (cd $$dir ; $(MAKE) doxygen-docs) \
     1056          fi ; \
     1057        done ;
     1058
     1059clean-all-doxygen-docs:
     1060        for dir in $(subdirs) ; do \
     1061          if test -r $$dir/doxydoc ; then \
     1062            (cd $$dir ; $(MAKE) clean-doxygen-docs) \
     1063          fi ; \
     1064        done ;
     1065
     1066install-all-doxygen-docs: all-doxygen-docs
     1067        for dir in $(subdirs) ; do \
     1068          do_project=true;\
     1069          for proj in $(COIN_SKIP_DOXYGEN); do\
     1070            if test $$dir = $$proj; then\
     1071              do_project=false;\
     1072            fi;\
     1073          done;\
     1074          if test -r $$dir/doxydoc & $$do_project = true; then \
     1075            (cd $$dir ; $(MAKE) install-doxygen-docs) \
     1076          fi ; \
     1077        done ;
     1078
     1079uninstall-all-doxygen-docs:
     1080        for dir in $(subdirs) ; do \
     1081          if test -r $$dir/doxydoc ; then \
     1082            (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \
     1083          fi ; \
     1084        done ;
     1085
     1086install-doc: $(DocFiles)
    9921087        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    9931088        for file in $(DocFiles); do \
    9941089          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    9951090          if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
    996         done
     1091        done 
    9971092
    9981093uninstall-doc:
  • releases/2.9.4/Cbc/README

    r2350 r2350  
    1 # CBC Version 2.9.2 README
     1# CBC Version 2.9.3 README
    22
    33Welcome to the README for the COIN Branch and Cut Solver (CBC). CBC is
     
    3737## CHANGELOG
    3838
    39  * Release 5.9.2
     39 * Release 2.9.3
     40
     41   * Minor bug fixes
     42
     43 * Release 2.9.2
    4044
    4145   * Fix for proper installation with ```DESTDIR```
    4246
    43  * Release 5.9.1
     47 * Release 2.9.1
    4448
    4549   * Fix for dependency linking
    4650   * Minor bug fixes
    4751
    48  * Release 5.9.0
    49    * Major algorithmic improvements
    50 
    51  * Release 5.8.13
     52 * Release 2.9.0
     53
     54   * Introduced specialized branching methods for dealing with "big Ms".
     55   * Introduced new methods for dealing with symmetry (requires installation of [nauty](http://pallini.di.uniroma1.it/))
     56   * Introduction of conflict cuts (off by default, turn on with `-constraint conflict`)
     57
     58 * Release 2.8.13
     59
    5260   * Improved message handling
    5361   * Miscellaneous bug fixes.
    5462
    55  * Release 5.8.12
     63 * Release 2.8.12
    5664   * Update for dependencies.
    5765
    5866 * Release 5.8.11
     67
    5968   * Major overhaul of C interface
    6069   * Fixes to SOS
    6170   * Miscellaneous bug fixes
    6271
    63  * Release 5.8.10
     72 * Release 2.8.10
     73
    6474   * More changes related to thread safety.
    6575   * Fix bug in build system with Visual Studio compiler.
    6676   * Miscellaneous bug fixes.
    6777
    68  * Release 5.8.9
     78 * Release 2.8.9
     79
    6980   * Attempt to make Cbc thread safe.
    7081   * Add parallel examples.
     
    7283   * Bug fixes.
    7384
    74  * Release 5.8.8
     85 * Release 2.8.8
    7586
    7687   * Added example to show how to use Cbc with installed libraries in MSVC++
     
    7889     {{{cbc_addlibs.txt}}}.
    7990
    80  * Release 5.8.7
     91 * Release 2.8.7
    8192
    8293   * Changed so that Doxygen builds LaTex
    8394   * Fixes for build system
    8495
    85  * Release 5.8.6
     96 * Release 2.8.6
    8697
    8798   * Added option to explicitly link dependencies to comply with packaging
     
    89100     DLLs.
    90101
    91  * Release 5.8.5
     102 * Release 2.8.5
     103
    92104   * Minor fixes to build system
    93105
    94  * Release 5.8.4
     106 * Release 2.8.4
    95107   * Small bug fixes
    96108   * Upgrades to build system
  • releases/2.9.4/Cbc/configure

    r2350 r2350  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.9.3.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.9.4.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.9.3'
    433 PACKAGE_STRING='Cbc 2.9.3'
     432PACKAGE_VERSION='2.9.4'
     433PACKAGE_STRING='Cbc 2.9.4'
    434434PACKAGE_BUGREPORT='cbc@lists.coin-or.org'
    435435
     
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CBC_SVN_REV CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED COINDEPEND_LIBS COINDEPEND_CFLAGS COINDEPEND_DATA COINDEPEND_DEPENDENCIES COINDEPEND_LIBS_INSTALLED COINDEPEND_CFLAGS_INSTALLED COINDEPEND_DATA_INSTALLED CBCLIB_CFLAGS CBCLIB_LIBS CBCLIB_PCLIBS CBCLIB_PCREQUIRES CBCLIB_DEPENDENCIES CBCLIB_CFLAGS_INSTALLED CBCLIB_LIBS_INSTALLED CBCGENERIC_CFLAGS CBCGENERIC_LIBS CBCGENERIC_PCLIBS CBCGENERIC_PCREQUIRES CBCGENERIC_DEPENDENCIES CBCGENERIC_CFLAGS_INSTALLED CBCGENERIC_LIBS_INSTALLED COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA CLP_DEPENDENCIES CLP_LIBS_INSTALLED CLP_CFLAGS_INSTALLED CLP_DATA_INSTALLED COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA OSITESTS_DEPENDENCIES OSITESTS_LIBS_INSTALLED OSITESTS_CFLAGS_INSTALLED OSITESTS_DATA_INSTALLED COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA SAMPLE_DEPENDENCIES SAMPLE_LIBS_INSTALLED SAMPLE_CFLAGS_INSTALLED SAMPLE_DATA_INSTALLED COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA NETLIB_DEPENDENCIES NETLIB_LIBS_INSTALLED NETLIB_CFLAGS_INSTALLED NETLIB_DATA_INSTALLED COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE MIPLIB3_LIBS MIPLIB3_CFLAGS MIPLIB3_DATA MIPLIB3_DEPENDENCIES MIPLIB3_LIBS_INSTALLED MIPLIB3_CFLAGS_INSTALLED MIPLIB3_DATA_INSTALLED COIN_HAS_MIPLIB3_TRUE COIN_HAS_MIPLIB3_FALSE DYLP_LIBS DYLP_CFLAGS DYLP_DATA DYLP_DEPENDENCIES DYLP_LIBS_INSTALLED DYLP_CFLAGS_INSTALLED DYLP_DATA_INSTALLED COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOL_LIBS VOL_CFLAGS VOL_DATA VOL_DEPENDENCIES VOL_LIBS_INSTALLED VOL_CFLAGS_INSTALLED VOL_DATA_INSTALLED COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA CPX_DEPENDENCIES CPX_LIBS_INSTALLED CPX_CFLAGS_INSTALLED CPX_DATA_INSTALLED COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPK_LIBS GLPK_CFLAGS GLPK_DATA GLPK_DEPENDENCIES GLPK_LIBS_INSTALLED GLPK_CFLAGS_INSTALLED GLPK_DATA_INSTALLED COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA GRB_DEPENDENCIES GRB_LIBS_INSTALLED GRB_CFLAGS_INSTALLED GRB_DATA_INSTALLED COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA MSK_DEPENDENCIES MSK_LIBS_INSTALLED MSK_CFLAGS_INSTALLED MSK_DATA_INSTALLED COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA SPX_DEPENDENCIES SPX_LIBS_INSTALLED SPX_CFLAGS_INSTALLED SPX_DATA_INSTALLED COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA XPR_DEPENDENCIES XPR_LIBS_INSTALLED XPR_CFLAGS_INSTALLED XPR_DATA_INSTALLED COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA ASL_DEPENDENCIES ASL_LIBS_INSTALLED ASL_CFLAGS_INSTALLED ASL_DATA_INSTALLED COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE OSICBC_DFLT_SOLVER_CLP_TRUE OSICBC_DFLT_SOLVER_CLP_FALSE OSICBC_DFLT_SOLVER_CPX_TRUE OSICBC_DFLT_SOLVER_CPX_FALSE OSICBC_DFLT_SOLVER_DYLP_TRUE OSICBC_DFLT_SOLVER_DYLP_FALSE OSICBC_DFLT_SOLVER_GLPK_TRUE OSICBC_DFLT_SOLVER_GLPK_FALSE OSICBC_DFLT_SOLVER_GRB_TRUE OSICBC_DFLT_SOLVER_GRB_FALSE OSICBC_DFLT_SOLVER_MSK_TRUE OSICBC_DFLT_SOLVER_MSK_FALSE OSICBC_DFLT_SOLVER_SPX_TRUE OSICBC_DFLT_SOLVER_SPX_FALSE OSICBC_DFLT_SOLVER_SYM_TRUE OSICBC_DFLT_SOLVER_SYM_FALSE OSICBC_DFLT_SOLVER_VOL_TRUE OSICBC_DFLT_SOLVER_VOL_FALSE OSICBC_DFLT_SOLVER_XPR_TRUE OSICBC_DFLT_SOLVER_XPR_FALSE coin_have_doxygen coin_doxy_usedot coin_doxy_tagname coin_doxy_logname coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CBC_SVN_REV CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED COINDEPEND_LIBS COINDEPEND_CFLAGS COINDEPEND_DATA COINDEPEND_DEPENDENCIES COINDEPEND_LIBS_INSTALLED COINDEPEND_CFLAGS_INSTALLED COINDEPEND_DATA_INSTALLED CBCLIB_CFLAGS CBCLIB_LIBS CBCLIB_PCLIBS CBCLIB_PCREQUIRES CBCLIB_DEPENDENCIES CBCLIB_CFLAGS_INSTALLED CBCLIB_LIBS_INSTALLED CBCGENERIC_CFLAGS CBCGENERIC_LIBS CBCGENERIC_PCLIBS CBCGENERIC_PCREQUIRES CBCGENERIC_DEPENDENCIES CBCGENERIC_CFLAGS_INSTALLED CBCGENERIC_LIBS_INSTALLED COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA CLP_DEPENDENCIES CLP_LIBS_INSTALLED CLP_CFLAGS_INSTALLED CLP_DATA_INSTALLED COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA OSITESTS_DEPENDENCIES OSITESTS_LIBS_INSTALLED OSITESTS_CFLAGS_INSTALLED OSITESTS_DATA_INSTALLED COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA SAMPLE_DEPENDENCIES SAMPLE_LIBS_INSTALLED SAMPLE_CFLAGS_INSTALLED SAMPLE_DATA_INSTALLED COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA NETLIB_DEPENDENCIES NETLIB_LIBS_INSTALLED NETLIB_CFLAGS_INSTALLED NETLIB_DATA_INSTALLED COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE MIPLIB3_LIBS MIPLIB3_CFLAGS MIPLIB3_DATA MIPLIB3_DEPENDENCIES MIPLIB3_LIBS_INSTALLED MIPLIB3_CFLAGS_INSTALLED MIPLIB3_DATA_INSTALLED COIN_HAS_MIPLIB3_TRUE COIN_HAS_MIPLIB3_FALSE DYLP_LIBS DYLP_CFLAGS DYLP_DATA DYLP_DEPENDENCIES DYLP_LIBS_INSTALLED DYLP_CFLAGS_INSTALLED DYLP_DATA_INSTALLED COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOL_LIBS VOL_CFLAGS VOL_DATA VOL_DEPENDENCIES VOL_LIBS_INSTALLED VOL_CFLAGS_INSTALLED VOL_DATA_INSTALLED COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA CPX_DEPENDENCIES CPX_LIBS_INSTALLED CPX_CFLAGS_INSTALLED CPX_DATA_INSTALLED COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPK_LIBS GLPK_CFLAGS GLPK_DATA GLPK_DEPENDENCIES GLPK_LIBS_INSTALLED GLPK_CFLAGS_INSTALLED GLPK_DATA_INSTALLED COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA GRB_DEPENDENCIES GRB_LIBS_INSTALLED GRB_CFLAGS_INSTALLED GRB_DATA_INSTALLED COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA MSK_DEPENDENCIES MSK_LIBS_INSTALLED MSK_CFLAGS_INSTALLED MSK_DATA_INSTALLED COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA SPX_DEPENDENCIES SPX_LIBS_INSTALLED SPX_CFLAGS_INSTALLED SPX_DATA_INSTALLED COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA XPR_DEPENDENCIES XPR_LIBS_INSTALLED XPR_CFLAGS_INSTALLED XPR_DATA_INSTALLED COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA ASL_DEPENDENCIES ASL_LIBS_INSTALLED ASL_CFLAGS_INSTALLED ASL_DATA_INSTALLED COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE OSICBC_DFLT_SOLVER_CLP_TRUE OSICBC_DFLT_SOLVER_CLP_FALSE OSICBC_DFLT_SOLVER_CPX_TRUE OSICBC_DFLT_SOLVER_CPX_FALSE OSICBC_DFLT_SOLVER_DYLP_TRUE OSICBC_DFLT_SOLVER_DYLP_FALSE OSICBC_DFLT_SOLVER_GLPK_TRUE OSICBC_DFLT_SOLVER_GLPK_FALSE OSICBC_DFLT_SOLVER_GRB_TRUE OSICBC_DFLT_SOLVER_GRB_FALSE OSICBC_DFLT_SOLVER_MSK_TRUE OSICBC_DFLT_SOLVER_MSK_FALSE OSICBC_DFLT_SOLVER_SPX_TRUE OSICBC_DFLT_SOLVER_SPX_FALSE OSICBC_DFLT_SOLVER_SYM_TRUE OSICBC_DFLT_SOLVER_SYM_FALSE OSICBC_DFLT_SOLVER_VOL_TRUE OSICBC_DFLT_SOLVER_VOL_FALSE OSICBC_DFLT_SOLVER_XPR_TRUE OSICBC_DFLT_SOLVER_XPR_FALSE coin_have_doxygen coin_have_latex coin_doxy_usedot coin_doxy_tagname coin_doxy_logname COIN_HAS_DOXYGEN_TRUE COIN_HAS_DOXYGEN_FALSE COIN_HAS_LATEX_TRUE COIN_HAS_LATEX_FALSE coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    10061006  # This message is too long to be a string in the A/UX 3.1 sh.
    10071007  cat <<_ACEOF
    1008 \`configure' configures Cbc 2.9.3 to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.9.4 to adapt to many kinds of systems.
    10091009
    10101010Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10721072if test -n "$ac_init_help"; then
    10731073  case $ac_init_help in
    1074      short | recursive ) echo "Configuration of Cbc 2.9.3:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.9.4:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13091309if $ac_init_version; then
    13101310  cat <<\_ACEOF
    1311 Cbc configure 2.9.3
     1311Cbc configure 2.9.4
    13121312generated by GNU Autoconf 2.59
    13131313
     
    13291329running configure, to aid debugging if configure makes a mistake.
    13301330
    1331 It was created by Cbc $as_me 2.9.3, which was
     1331It was created by Cbc $as_me 2.9.4, which was
    13321332generated by GNU Autoconf 2.59.  Invocation command line was
    13331333
     
    18551855
    18561856# Capture libtool library version, if given.
    1857  coin_libversion=12:3:9
     1857 coin_libversion=12:4:9
    18581858
    18591859
     
    45774577# Define the identity of the package.
    45784578 PACKAGE='cbc'
    4579  VERSION='2.9.3'
     4579 VERSION='2.9.4'
    45804580
    45814581
     
    3025030250fi
    3025130251
     30252# Extract the first word of "latex", so it can be a program name with args.
     30253set dummy latex; ac_word=$2
     30254echo "$as_me:$LINENO: checking for $ac_word" >&5
     30255echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     30256if test "${ac_cv_prog_coin_have_latex+set}" = set; then
     30257  echo $ECHO_N "(cached) $ECHO_C" >&6
     30258else
     30259  if test -n "$coin_have_latex"; then
     30260  ac_cv_prog_coin_have_latex="$coin_have_latex" # Let the user override the test.
     30261else
     30262as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     30263for as_dir in $PATH
     30264do
     30265  IFS=$as_save_IFS
     30266  test -z "$as_dir" && as_dir=.
     30267  for ac_exec_ext in '' $ac_executable_extensions; do
     30268  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     30269    ac_cv_prog_coin_have_latex="yes"
     30270    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     30271    break 2
     30272  fi
     30273done
     30274done
     30275
     30276  test -z "$ac_cv_prog_coin_have_latex" && ac_cv_prog_coin_have_latex="no"
     30277fi
     30278fi
     30279coin_have_latex=$ac_cv_prog_coin_have_latex
     30280if test -n "$coin_have_latex"; then
     30281  echo "$as_me:$LINENO: result: $coin_have_latex" >&5
     30282echo "${ECHO_T}$coin_have_latex" >&6
     30283else
     30284  echo "$as_me:$LINENO: result: no" >&5
     30285echo "${ECHO_T}no" >&6
     30286fi
     30287
    3025230288
    3025330289# Look for the dot tool from the graphviz package, unless the user has
     
    3031430350
    3031530351
     30352
     30353if test $coin_have_doxygen = yes; then
     30354  COIN_HAS_DOXYGEN_TRUE=
     30355  COIN_HAS_DOXYGEN_FALSE='#'
     30356else
     30357  COIN_HAS_DOXYGEN_TRUE='#'
     30358  COIN_HAS_DOXYGEN_FALSE=
     30359fi
     30360
     30361
     30362
     30363if test $coin_have_latex = yes; then
     30364  COIN_HAS_LATEX_TRUE=
     30365  COIN_HAS_LATEX_FALSE='#'
     30366else
     30367  COIN_HAS_LATEX_TRUE='#'
     30368  COIN_HAS_LATEX_FALSE=
     30369fi
     30370
     30371
    3031630372# Process the list of project names and massage them into possible doxygen
    3031730373# doc'n directories. Prefer 1) classic external, source processed using
     
    3033330389  doxytag=${lc_proj}_doxy.tag
    3033430390  doxyfound=no
    30335   for chkProj in $coin_subdirs ; do
    30336     if test "$chkProj" = "$proj" ; then
    30337       # proj will be configured, hence doxydoc present in build tree
    30338       doxysrcdir="${srcdir}/${proj}"
    30339       # AC_MSG_NOTICE([Considering $doxysrcdir (base)])
    30340       if test -d "$doxysrcdir" ; then
    30341         # with a doxydoc directory?
    30342         doxydir="$doxysrcdir/doxydoc"
    30343         # AC_MSG_NOTICE([Considering $doxydir (base)])
    30344         # AC_MSG_NOTICE([Subdirs: $coin_subdirs)])
    30345         if test -d "$doxydir" ; then
    30346           # use tag file; don't process source
    30347           eval doxydir="`pwd`/${proj}/doxydoc"
    30348           coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=$doxydir/html"
    30349           echo "$as_me:$LINENO: result: $doxydir (tag)" >&5
     30391  # proj will be configured, hence doxydoc present in build tree
     30392  doxysrcdir="${srcdir}/../${proj}"
     30393  # AC_MSG_NOTICE([Considering $doxysrcdir (base)])
     30394  if test -d "$doxysrcdir" ; then
     30395    # with a doxydoc directory?
     30396    doxydir="$doxysrcdir/doxydoc"
     30397    # AC_MSG_NOTICE([Considering $doxydir (base)])
     30398    # AC_MSG_NOTICE([Subdirs: $coin_subdirs)])
     30399    if test -d "$doxydir" ; then
     30400      # use tag file; don't process source
     30401      doxydir="../${proj}/doxydoc"
     30402      coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=../../$doxydir/html"
     30403      echo "$as_me:$LINENO: result: $doxydir (tag)" >&5
    3035030404echo "${ECHO_T}$doxydir (tag)" >&6
    30351           coin_doxy_excludes="$coin_doxy_excludes */${proj}"
    30352         else
    30353           # will process the source -- nothing further to be done here
    30354           echo "$as_me:$LINENO: result: $doxysrcdir (src)" >&5
     30405      coin_doxy_excludes="$coin_doxy_excludes */${proj}"
     30406    else
     30407      # will process the source -- nothing further to be done here
     30408      echo "$as_me:$LINENO: result: $doxysrcdir (src)" >&5
    3035530409echo "${ECHO_T}$doxysrcdir (src)" >&6
    30356         fi
    30357         doxyfound=yes
    30358       fi
    3035930410    fi
    30360   done
     30411    doxyfound=yes
     30412  fi
    3036130413  # Not built, fall back to installed tag file
    3036230414  if test $doxyfound = no ; then
     
    3089730949Usually this means the macro was only invoked conditionally." >&5
    3089830950echo "$as_me: error: conditional \"OSICBC_DFLT_SOLVER_XPR\" was never defined.
     30951Usually this means the macro was only invoked conditionally." >&2;}
     30952   { (exit 1); exit 1; }; }
     30953fi
     30954if test -z "${COIN_HAS_DOXYGEN_TRUE}" && test -z "${COIN_HAS_DOXYGEN_FALSE}"; then
     30955  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_DOXYGEN\" was never defined.
     30956Usually this means the macro was only invoked conditionally." >&5
     30957echo "$as_me: error: conditional \"COIN_HAS_DOXYGEN\" was never defined.
     30958Usually this means the macro was only invoked conditionally." >&2;}
     30959   { (exit 1); exit 1; }; }
     30960fi
     30961if test -z "${COIN_HAS_LATEX_TRUE}" && test -z "${COIN_HAS_LATEX_FALSE}"; then
     30962  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_LATEX\" was never defined.
     30963Usually this means the macro was only invoked conditionally." >&5
     30964echo "$as_me: error: conditional \"COIN_HAS_LATEX\" was never defined.
    3089930965Usually this means the macro was only invoked conditionally." >&2;}
    3090030966   { (exit 1); exit 1; }; }
     
    3117131237cat >&5 <<_CSEOF
    3117231238
    31173 This file was extended by Cbc $as_me 2.9.3, which was
     31239This file was extended by Cbc $as_me 2.9.4, which was
    3117431240generated by GNU Autoconf 2.59.  Invocation command line was
    3117531241
     
    3123431300cat >>$CONFIG_STATUS <<_ACEOF
    3123531301ac_cs_version="\\
    31236 Cbc config.status 2.9.3
     31302Cbc config.status 2.9.4
    3123731303configured by $0, generated by GNU Autoconf 2.59,
    3123831304  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
     
    3172531791s,@OSICBC_DFLT_SOLVER_XPR_FALSE@,$OSICBC_DFLT_SOLVER_XPR_FALSE,;t t
    3172631792s,@coin_have_doxygen@,$coin_have_doxygen,;t t
     31793s,@coin_have_latex@,$coin_have_latex,;t t
    3172731794s,@coin_doxy_usedot@,$coin_doxy_usedot,;t t
    3172831795s,@coin_doxy_tagname@,$coin_doxy_tagname,;t t
    3172931796s,@coin_doxy_logname@,$coin_doxy_logname,;t t
     31797s,@COIN_HAS_DOXYGEN_TRUE@,$COIN_HAS_DOXYGEN_TRUE,;t t
     31798s,@COIN_HAS_DOXYGEN_FALSE@,$COIN_HAS_DOXYGEN_FALSE,;t t
     31799s,@COIN_HAS_LATEX_TRUE@,$COIN_HAS_LATEX_TRUE,;t t
     31800s,@COIN_HAS_LATEX_FALSE@,$COIN_HAS_LATEX_FALSE,;t t
    3173031801s,@coin_doxy_tagfiles@,$coin_doxy_tagfiles,;t t
    3173131802s,@coin_doxy_excludes@,$coin_doxy_excludes,;t t
  • releases/2.9.4/Cbc/configure.ac

    r2350 r2350  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.9.3],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.9.4],[cbc@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
     
    4242# externals.  The following macro ensures that those externals are
    4343# retrieved by svn if they are not there yet.
    44 AC_COIN_PROJECTDIR_INIT(Cbc,12:3:9)
     44AC_COIN_PROJECTDIR_INIT(Cbc,12:4:9)
    4545
    4646# Check if user wants to produce debugging code
  • releases/2.9.4/Cbc/src

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • releases/2.9.4/Cbc/src/CbcCutGenerator.cpp

    r2350 r2350  
    430430                    printf("On optimal path CbcCut\n");
    431431                    int nCols = solver->getNumCols();
    432                     int i;
    433432                    const double * optimal = debugger->optimalSolution();
    434433                    const double * objective = solver->getObjCoefficients();
    435434                    double objval1 = 0.0, objval2 = 0.0;
    436                     for (i = 0; i < nCols; i++) {
     435                    for (int i = 0; i < nCols; i++) {
     436                        if (!solver->isInteger(i))
     437                          continue;
    437438#if CGL_DEBUG>1
    438439                        printf("%d %g %g %g %g\n", i, lower[i], solution[i], upper[i], optimal[i]);
     
    616617            const OsiRowCutDebugger * debugger = solver->getRowCutDebugger();
    617618#endif
     619            //#define WEAKEN_CUTS 1
     620#ifdef WEAKEN_CUTS
     621            const double * lower = solver->getColLower();
     622            const double * upper = solver->getColUpper();
     623            const double * solution = solver->getColSolution();
     624#endif
    618625            for (k = numberRowCutsBefore; k < numberRowCutsAfter; k++) {
    619626                OsiRowCut * thisCut = cs.rowCutPtr(k) ;
     627#ifdef WEAKEN_CUTS
     628                // weaken cut if coefficients not integer
     629                double lb=thisCut->lb();
     630                double ub=thisCut->ub();
     631                if (lb<-1.0e100||ub>1.0e100) {
     632                  // normal cut
     633                  CoinPackedVector rpv = thisCut->row();
     634                  const int n = rpv.getNumElements();
     635                  const int * indices = rpv.getIndices();
     636                  const double * elements = rpv.getElements();
     637                  double bound=0.0;
     638                  double sum=0.0;
     639                  bool integral=true;
     640                  int nInteger=0;
     641                  for (int k=0; k<n; k++) {
     642                    double value = fabs(elements[k]);
     643                    int column=indices[k];
     644                    sum += value;
     645                    if (value!=floor(value+0.5))
     646                      integral=false;
     647                    if (solver->isInteger(column)) {
     648                      nInteger++;
     649                      double largerBound = CoinMax(fabs(lower[column]),
     650                                                   fabs(upper[column]));
     651                      double solutionBound=fabs(solution[column])+10.0;
     652                      bound += CoinMin(largerBound,solutionBound);
     653                    }
     654                  }
     655#if WEAKEN_CUTS ==1
     656                  // leave if all 0-1
     657                  if (nInteger==bound)
     658                    integral=true;
     659#elif WEAKEN_CUTS==4||WEAKEN_CUTS==5
     660                  // leave if all 0-1
     661                  if (nInteger==bound && n < 40)
     662                    integral=true;
     663#endif
     664                  if (!integral) {
     665                    double weakenBy=1.0e-7*(bound+sum);
     666#if WEAKEN_CUTS==3||WEAKEN_CUTS==5
     667                    weakenBy *= 10.0;
     668#endif             
     669                    if (lb<-1.0e100)
     670                      thisCut->setUb(ub+weakenBy);
     671                    else
     672                      thisCut->setLb(lb-weakenBy);
     673                  }
     674                }
     675#endif
    620676#ifdef CGL_DEBUG
    621677                if (debugger && debugger->onOptimalPath(*solver)) {
    622                     assert(!debugger->invalidCut(*thisCut));
    623                     if(debugger->invalidCut(*thisCut))
     678                  if(debugger->invalidCut(*thisCut)) {
    624679                      abort();
     680                  }
    625681                }
    626682#endif
  • releases/2.9.4/Cbc/src/CbcHeuristic.cpp

    r2350 r2350  
    24202420                    way = -1.0;
    24212421                    improvement = downImprovement;
     2422                    if (isInteger&&currentValue<lowerValue+0.99)
     2423                      continue; // no good
    24222424                } else if (upImprovement > 0.0 && currentValue < upperValue) {
    24232425                    way = 1.0;
    24242426                    improvement = upImprovement;
     2427                    if (isInteger&&currentValue>upperValue-0.99)
     2428                      continue; // no good
    24252429                }
    24262430                if (way) {
  • releases/2.9.4/Cbc/src/CbcModel.cpp

    r2350 r2350  
    20892089        }
    20902090        originalContinuousObjective_ = COIN_DBL_MAX;
     2091        if (bestSolution_ &&
     2092            ((specialOptions_&8388608)==0||(specialOptions_&2048)!=0)) {
     2093          // best solution found by various heuristics - set solution
     2094          char general[200];
     2095          sprintf(general,"Solution of %g already found by heuristic",
     2096                  bestObjective_);
     2097          messageHandler()->message(CBC_GENERAL,
     2098                                    messages())
     2099            << general << CoinMessageEol ;
     2100          setCutoff(1.0e50) ; // As best solution should be worse than cutoff
     2101          // change cutoff as constraint if wanted
     2102          if (cutoffRowNumber_>=0) {
     2103            if (solver_->getNumRows()>cutoffRowNumber_)
     2104              solver_->setRowUpper(cutoffRowNumber_,1.0e50);
     2105          }
     2106          // also in continuousSolver_
     2107          if (continuousSolver_) {
     2108            // Solvers know about direction
     2109            double direction = solver_->getObjSense();
     2110            continuousSolver_->setDblParam(OsiDualObjectiveLimit, 1.0e50*direction);
     2111          } else {
     2112            continuousSolver_ = solver_->clone();
     2113          }
     2114          phase_ = 5;
     2115          double increment = getDblParam(CbcModel::CbcCutoffIncrement) ;
     2116          if ((specialOptions_&4) == 0)
     2117            bestObjective_ += 100.0 * increment + 1.0e-3; // only set if we are going to solve
     2118          setBestSolution(CBC_END_SOLUTION, bestObjective_, bestSolution_, 1) ;
     2119          continuousSolver_->resolve() ;
     2120          if (!continuousSolver_->isProvenOptimal()) {
     2121            continuousSolver_->messageHandler()->setLogLevel(2) ;
     2122            continuousSolver_->initialSolve() ;
     2123          }
     2124          delete solver_ ;
     2125          solver_ = continuousSolver_ ;
     2126          setPointers(solver_);
     2127          continuousSolver_ = NULL ;
     2128        }
    20912129        solverCharacteristics_ = NULL;
    20922130        if (flipObjective)
     
    48094847            double dummyBest;
    48104848            tree_->cleanTree(this, -COIN_DBL_MAX, dummyBest) ;
    4811 #ifdef CBC_THREAD
     4849#if 0 // Does not seem to be needed def CBC_THREAD
    48124850            if (parallelMode() > 0 && master_) {
    48134851              // see if any dangling nodes
  • releases/2.9.4/Cbc/src/CbcNode.cpp

    r2350 r2350  
    23672367                    }
    23682368                    delete [] rowActivity;
    2369                     delete [] solution;
    23702369                    if (!satisfied) {
    23712370#ifdef CLP_INVESTIGATE
     
    23942393                        }
    23952394                    }
     2395                    delete [] solution;
    23962396                }
    23972397            } else if (iPass == 1) {
  • releases/2.9.4/Cbc/src/CbcSolver.cpp

    r2350 r2350  
    17131713        gomoryGen.setLimit(50);
    17141714        // set default action (0=off,1=on,2=root)
     1715#ifdef SWAP_GOMORY
     1716        int gomoryAction = 0;
     1717#else
    17151718        int gomoryAction = 3;
     1719#endif
    17161720
    17171721        CglProbing probingGen;
     
    17541758        //GMIGen.setLimit(100);
    17551759        // set default action (0=off,1=on,2=root)
     1760#ifdef SWAP_GOMORY
     1761        int GMIAction = 3;
     1762#else
    17561763        // Off
    17571764        int GMIAction = 0;
     1765#endif
    17581766
    17591767        CglFakeClique cliqueGen(NULL, false);
     
    23162324                                        generalMessageHandler->message(CLP_GENERAL, generalMessages)
    23172325                                        << message << CoinMessageEol;
     2326#ifdef SWAP_GOMORY
     2327                                    GMIAction = 3;
     2328                                    message=parameters_[whichParam(CBC_PARAM_STR_GMICUTS, numberParameters_, parameters_)].setCurrentOptionWithMessage("ifmove");
     2329#else
    23182330                                    GMIAction = 2;
    23192331                                    message=parameters_[whichParam(CBC_PARAM_STR_GMICUTS, numberParameters_, parameters_)].setCurrentOptionWithMessage("root");
     2332#endif
    23202333                                    if (!noPrinting_&&message)
    23212334                                        generalMessageHandler->message(CLP_GENERAL, generalMessages)
  • releases/2.9.4/Cbc/src/Makefile.in

    r2350 r2350  
    249249COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    250250COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     251COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
     252COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
    251253COIN_HAS_DYLP_FALSE = @COIN_HAS_DYLP_FALSE@
    252254COIN_HAS_DYLP_TRUE = @COIN_HAS_DYLP_TRUE@
     
    255257COIN_HAS_GRB_FALSE = @COIN_HAS_GRB_FALSE@
    256258COIN_HAS_GRB_TRUE = @COIN_HAS_GRB_TRUE@
     259COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
     260COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
    257261COIN_HAS_MIPLIB3_FALSE = @COIN_HAS_MIPLIB3_FALSE@
    258262COIN_HAS_MIPLIB3_TRUE = @COIN_HAS_MIPLIB3_TRUE@
     
    474478coin_doxy_usedot = @coin_doxy_usedot@
    475479coin_have_doxygen = @coin_have_doxygen@
     480coin_have_latex = @coin_have_latex@
    476481datadir = @datadir@
    477482exec_prefix = @exec_prefix@
  • releases/2.9.4/Cbc/src/OsiCbc/Makefile.in

    r2350 r2350  
    175175COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    176176COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     177COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
     178COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
    177179COIN_HAS_DYLP_FALSE = @COIN_HAS_DYLP_FALSE@
    178180COIN_HAS_DYLP_TRUE = @COIN_HAS_DYLP_TRUE@
     
    181183COIN_HAS_GRB_FALSE = @COIN_HAS_GRB_FALSE@
    182184COIN_HAS_GRB_TRUE = @COIN_HAS_GRB_TRUE@
     185COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
     186COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
    183187COIN_HAS_MIPLIB3_FALSE = @COIN_HAS_MIPLIB3_FALSE@
    184188COIN_HAS_MIPLIB3_TRUE = @COIN_HAS_MIPLIB3_TRUE@
     
    400404coin_doxy_usedot = @coin_doxy_usedot@
    401405coin_have_doxygen = @coin_have_doxygen@
     406coin_have_latex = @coin_have_latex@
    402407datadir = @datadir@
    403408exec_prefix = @exec_prefix@
  • releases/2.9.4/Cbc/src/config_cbc_default.h

    r2350 r2350  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.9.3"
     8#define CBC_VERSION "2.9.4"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define CBC_VERSION_RELEASE 3
     17#define CBC_VERSION_RELEASE 4
  • releases/2.9.4/Cbc/test/Makefile.in

    r2350 r2350  
    169169COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    170170COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     171COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
     172COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
    171173COIN_HAS_DYLP_FALSE = @COIN_HAS_DYLP_FALSE@
    172174COIN_HAS_DYLP_TRUE = @COIN_HAS_DYLP_TRUE@
     
    175177COIN_HAS_GRB_FALSE = @COIN_HAS_GRB_FALSE@
    176178COIN_HAS_GRB_TRUE = @COIN_HAS_GRB_TRUE@
     179COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
     180COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
    177181COIN_HAS_MIPLIB3_FALSE = @COIN_HAS_MIPLIB3_FALSE@
    178182COIN_HAS_MIPLIB3_TRUE = @COIN_HAS_MIPLIB3_TRUE@
     
    394398coin_doxy_usedot = @coin_doxy_usedot@
    395399coin_have_doxygen = @coin_have_doxygen@
     400coin_have_latex = @coin_have_latex@
    396401datadir = @datadir@
    397402exec_prefix = @exec_prefix@
  • releases/2.9.4/Makefile.in

    r2350 r2350  
    114114COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
    115115COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
     116COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
     117COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
     118COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
     119COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
    116120COIN_SKIP_PROJECTS = @COIN_SKIP_PROJECTS@
    117121CPP = @CPP@
     
    211215coin_doxy_usedot = @coin_doxy_usedot@
    212216coin_have_doxygen = @coin_have_doxygen@
     217coin_have_latex = @coin_have_latex@
    213218datadir = @datadir@
    214219exec_prefix = @exec_prefix@
     
    256261DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \
    257262        $(VPATH_DISTCLEANFILES)
    258 DocFiles = README AUTHORS LICENSE
     263DocFiles = README AUTHORS LICENSE 
    259264DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     265COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
     266COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    260267all: all-recursive
    261268
     
    733740.PHONY: test unitTest tests unitTests doxydoc
    734741
    735 install-doc: $(DocFiles)
     742doxygen-docs:
     743        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     744          if test -d "doxydoc/"; then \
     745            doxygen doxydoc/doxygen.conf;\
     746          fi;\
     747        fi
     748
     749pdf-doxygen-docs: doxygen-docs
     750        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     751          if test -d "doxydoc/latex"; then \
     752            if test "$(COIN_HAS_LATEX)" = TRUE; then \
     753              cd doxydoc/latex;\
     754              $(MAKE) pdf;\
     755              cd -;\
     756            fi;\
     757          fi;\
     758        fi
     759
     760clean-doxygen-docs:
     761        if test -d "doxydoc/"; then \
     762          cd doxydoc ;\
     763          rm -rf html latex *.log *.tag;\
     764        fi
     765
     766install-doxygen-docs: doxygen-docs
     767        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     768          if test -d "doxydoc/"; then \
     769            test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
     770            $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
     771            if test -f "doxydoc/latex/refman.pdf"; then \
     772              $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
     773            fi;\
     774            if test -d "doxydoc/html"; then \
     775              test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
     776              $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
     777              $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
     778            fi;\
     779          fi;\
     780        fi
     781
     782uninstall-doxygen-docs:
     783        if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
     784          rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
     785        fi
     786        if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
     787          rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
     788        fi
     789
     790all-doxygen-docs:
     791        for dir in $(subdirs) ; do \
     792          do_project=true;\
     793          for proj in $(COIN_SKIP_DOXYGEN); do\
     794            if test $$dir = $$proj; then\
     795              do_project=false;\
     796            fi;\
     797          done;\
     798          if test -r $$dir/doxydoc & $$do_project = true; then \
     799            (cd $$dir ; $(MAKE) doxygen-docs) \
     800          fi ; \
     801        done ;
     802
     803clean-all-doxygen-docs:
     804        for dir in $(subdirs) ; do \
     805          if test -r $$dir/doxydoc ; then \
     806            (cd $$dir ; $(MAKE) clean-doxygen-docs) \
     807          fi ; \
     808        done ;
     809
     810install-all-doxygen-docs: all-doxygen-docs
     811        for dir in $(subdirs) ; do \
     812          do_project=true;\
     813          for proj in $(COIN_SKIP_DOXYGEN); do\
     814            if test $$dir = $$proj; then\
     815              do_project=false;\
     816            fi;\
     817          done;\
     818          if test -r $$dir/doxydoc & $$do_project = true; then \
     819            (cd $$dir ; $(MAKE) install-doxygen-docs) \
     820          fi ; \
     821        done ;
     822
     823uninstall-all-doxygen-docs:
     824        for dir in $(subdirs) ; do \
     825          if test -r $$dir/doxydoc ; then \
     826            (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \
     827          fi ; \
     828        done ;
     829
     830install-doc: $(DocFiles)
    736831        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    737832        for file in $(DocFiles); do \
    738833          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    739834          if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
    740         done
     835        done 
    741836
    742837uninstall-doc:
  • releases/2.9.4/README.md

    r2350 r2350  
    1 # CBC Version 2.9.2 README
     1# CBC Version 2.9.3 README
    22
    33Welcome to the README for the COIN Branch and Cut Solver (CBC). CBC is
     
    3737## CHANGELOG
    3838
    39  * Release 5.9.2
     39 * Release 2.9.3
     40
     41   * Minor bug fixes
     42
     43 * Release 2.9.2
    4044
    4145   * Fix for proper installation with ```DESTDIR```
    4246
    43  * Release 5.9.1
     47 * Release 2.9.1
    4448
    4549   * Fix for dependency linking
    4650   * Minor bug fixes
    4751
    48  * Release 5.9.0
    49    * Major algorithmic improvements
    50 
    51  * Release 5.8.13
     52 * Release 2.9.0
     53
     54   * Introduced specialized branching methods for dealing with "big Ms".
     55   * Introduced new methods for dealing with symmetry (requires installation of [nauty](http://pallini.di.uniroma1.it/))
     56   * Introduction of conflict cuts (off by default, turn on with `-constraint conflict`)
     57
     58 * Release 2.8.13
     59
    5260   * Improved message handling
    5361   * Miscellaneous bug fixes.
    5462
    55  * Release 5.8.12
     63 * Release 2.8.12
     64
    5665   * Update for dependencies.
    5766
    58  * Release 5.8.11
     67 * Release 2.8.11
     68
    5969   * Major overhaul of C interface
    6070   * Fixes to SOS
    6171   * Miscellaneous bug fixes
    6272
    63  * Release 5.8.10
     73 * Release 2.8.10
     74
    6475   * More changes related to thread safety.
    6576   * Fix bug in build system with Visual Studio compiler.
    6677   * Miscellaneous bug fixes.
    6778
    68  * Release 5.8.9
     79 * Release 2.8.9
     80
    6981   * Attempt to make Cbc thread safe.
    7082   * Add parallel examples.
     
    7284   * Bug fixes.
    7385
    74  * Release 5.8.8
     86 * Release 2.8.8
    7587
    7688   * Added example to show how to use Cbc with installed libraries in MSVC++
     
    7890     {{{cbc_addlibs.txt}}}.
    7991
    80  * Release 5.8.7
     92 * Release 2.8.7
    8193
    8294   * Changed so that Doxygen builds LaTex
    8395   * Fixes for build system
    8496
    85  * Release 5.8.6
     97 * Release 2.8.6
    8698
    8799   * Added option to explicitly link dependencies to comply with packaging
     
    89101     DLLs.
    90102
    91  * Release 5.8.5
     103 * Release 2.8.5
     104
    92105   * Minor fixes to build system
    93106
    94  * Release 5.8.4
     107 * Release 2.8.4
     108
    95109   * Small bug fixes
    96110   * Upgrades to build system
  • releases/2.9.4/configure

    r2350 r2350  
    22# From configure.ac 0.9.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for Cbc 2.9.3.
     4# Generated by GNU Autoconf 2.59 for Cbc 2.9.4.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='2.9.3'
    434 PACKAGE_STRING='Cbc 2.9.3'
     433PACKAGE_VERSION='2.9.4'
     434PACKAGE_STRING='Cbc 2.9.4'
    435435PACKAGE_BUGREPORT='cbc@lists.coin-or.org'
    436436
     
    490490ac_subdirs_all="$ac_subdirs_all Cgl"
    491491ac_subdirs_all="$ac_subdirs_all Cbc"
    492 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 ac_ct_F77 FFLAGS MPIF77 EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS COIN_SKIP_PROJECTS subdirs coin_have_doxygen coin_doxy_usedot coin_doxy_tagname coin_doxy_logname coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     492ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 ac_ct_F77 FFLAGS MPIF77 EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS COIN_SKIP_PROJECTS subdirs coin_have_doxygen coin_have_latex coin_doxy_usedot coin_doxy_tagname coin_doxy_logname COIN_HAS_DOXYGEN_TRUE COIN_HAS_DOXYGEN_FALSE COIN_HAS_LATEX_TRUE COIN_HAS_LATEX_FALSE coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    493493ac_subst_files=''
    494494
     
    10391039  # This message is too long to be a string in the A/UX 3.1 sh.
    10401040  cat <<_ACEOF
    1041 \`configure' configures Cbc 2.9.3 to adapt to many kinds of systems.
     1041\`configure' configures Cbc 2.9.4 to adapt to many kinds of systems.
    10421042
    10431043Usage: $0 [OPTION]... [VAR=VALUE]...
     
    11051105if test -n "$ac_init_help"; then
    11061106  case $ac_init_help in
    1107      short | recursive ) echo "Configuration of Cbc 2.9.3:";;
     1107     short | recursive ) echo "Configuration of Cbc 2.9.4:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13311331if $ac_init_version; then
    13321332  cat <<\_ACEOF
    1333 Cbc configure 2.9.3
     1333Cbc configure 2.9.4
    13341334generated by GNU Autoconf 2.59
    13351335
     
    13511351running configure, to aid debugging if configure makes a mistake.
    13521352
    1353 It was created by Cbc $as_me 2.9.3, which was
     1353It was created by Cbc $as_me 2.9.4, which was
    13541354generated by GNU Autoconf 2.59.  Invocation command line was
    13551355
     
    51175117# Define the identity of the package.
    51185118 PACKAGE='cbc'
    5119  VERSION='2.9.3'
     5119 VERSION='2.9.4'
    51205120
    51215121
     
    2281322813fi
    2281422814
     22815# Extract the first word of "latex", so it can be a program name with args.
     22816set dummy latex; ac_word=$2
     22817echo "$as_me:$LINENO: checking for $ac_word" >&5
     22818echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     22819if test "${ac_cv_prog_coin_have_latex+set}" = set; then
     22820  echo $ECHO_N "(cached) $ECHO_C" >&6
     22821else
     22822  if test -n "$coin_have_latex"; then
     22823  ac_cv_prog_coin_have_latex="$coin_have_latex" # Let the user override the test.
     22824else
     22825as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     22826for as_dir in $PATH
     22827do
     22828  IFS=$as_save_IFS
     22829  test -z "$as_dir" && as_dir=.
     22830  for ac_exec_ext in '' $ac_executable_extensions; do
     22831  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     22832    ac_cv_prog_coin_have_latex="yes"
     22833    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     22834    break 2
     22835  fi
     22836done
     22837done
     22838
     22839  test -z "$ac_cv_prog_coin_have_latex" && ac_cv_prog_coin_have_latex="no"
     22840fi
     22841fi
     22842coin_have_latex=$ac_cv_prog_coin_have_latex
     22843if test -n "$coin_have_latex"; then
     22844  echo "$as_me:$LINENO: result: $coin_have_latex" >&5
     22845echo "${ECHO_T}$coin_have_latex" >&6
     22846else
     22847  echo "$as_me:$LINENO: result: no" >&5
     22848echo "${ECHO_T}no" >&6
     22849fi
     22850
    2281522851
    2281622852# Look for the dot tool from the graphviz package, unless the user has
     
    2287722913
    2287822914
     22915
     22916if test $coin_have_doxygen = yes; then
     22917  COIN_HAS_DOXYGEN_TRUE=
     22918  COIN_HAS_DOXYGEN_FALSE='#'
     22919else
     22920  COIN_HAS_DOXYGEN_TRUE='#'
     22921  COIN_HAS_DOXYGEN_FALSE=
     22922fi
     22923
     22924
     22925
     22926if test $coin_have_latex = yes; then
     22927  COIN_HAS_LATEX_TRUE=
     22928  COIN_HAS_LATEX_FALSE='#'
     22929else
     22930  COIN_HAS_LATEX_TRUE='#'
     22931  COIN_HAS_LATEX_FALSE=
     22932fi
     22933
     22934
    2287922935# Process the list of project names and massage them into possible doxygen
    2288022936# doc'n directories. Prefer 1) classic external, source processed using
     
    2289622952  doxytag=${lc_proj}_doxy.tag
    2289722953  doxyfound=no
    22898   for chkProj in $coin_subdirs ; do
    22899     if test "$chkProj" = "$proj" ; then
    22900       # proj will be configured, hence doxydoc present in build tree
    22901       doxysrcdir="${srcdir}/${proj}"
    22902       # AC_MSG_NOTICE([Considering $doxysrcdir (base)])
    22903       if test -d "$doxysrcdir" ; then
    22904         # with a doxydoc directory?
    22905         doxydir="$doxysrcdir/doxydoc"
    22906         # AC_MSG_NOTICE([Considering $doxydir (base)])
    22907         # AC_MSG_NOTICE([Subdirs: $coin_subdirs)])
    22908         if test -d "$doxydir" ; then
    22909           # use tag file; don't process source
    22910           eval doxydir="`pwd`/${proj}/doxydoc"
    22911           coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=$doxydir/html"
    22912           echo "$as_me:$LINENO: result: $doxydir (tag)" >&5
     22954  # proj will be configured, hence doxydoc present in build tree
     22955  doxysrcdir="${srcdir}/../${proj}"
     22956  # AC_MSG_NOTICE([Considering $doxysrcdir (base)])
     22957  if test -d "$doxysrcdir" ; then
     22958    # with a doxydoc directory?
     22959    doxydir="$doxysrcdir/doxydoc"
     22960    # AC_MSG_NOTICE([Considering $doxydir (base)])
     22961    # AC_MSG_NOTICE([Subdirs: $coin_subdirs)])
     22962    if test -d "$doxydir" ; then
     22963      # use tag file; don't process source
     22964      doxydir="../${proj}/doxydoc"
     22965      coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=../../$doxydir/html"
     22966      echo "$as_me:$LINENO: result: $doxydir (tag)" >&5
    2291322967echo "${ECHO_T}$doxydir (tag)" >&6
    22914           coin_doxy_excludes="$coin_doxy_excludes */${proj}"
    22915         else
    22916           # will process the source -- nothing further to be done here
    22917           echo "$as_me:$LINENO: result: $doxysrcdir (src)" >&5
     22968      coin_doxy_excludes="$coin_doxy_excludes */${proj}"
     22969    else
     22970      # will process the source -- nothing further to be done here
     22971      echo "$as_me:$LINENO: result: $doxysrcdir (src)" >&5
    2291822972echo "${ECHO_T}$doxysrcdir (src)" >&6
    22919         fi
    22920         doxyfound=yes
    22921       fi
    2292222973    fi
    22923   done
     22974    doxyfound=yes
     22975  fi
    2292422976  # Not built, fall back to installed tag file
    2292522977  if test $doxyfound = no ; then
     
    2318923241   { (exit 1); exit 1; }; }
    2319023242fi
     23243if test -z "${COIN_HAS_DOXYGEN_TRUE}" && test -z "${COIN_HAS_DOXYGEN_FALSE}"; then
     23244  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_DOXYGEN\" was never defined.
     23245Usually this means the macro was only invoked conditionally." >&5
     23246echo "$as_me: error: conditional \"COIN_HAS_DOXYGEN\" was never defined.
     23247Usually this means the macro was only invoked conditionally." >&2;}
     23248   { (exit 1); exit 1; }; }
     23249fi
     23250if test -z "${COIN_HAS_LATEX_TRUE}" && test -z "${COIN_HAS_LATEX_FALSE}"; then
     23251  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_LATEX\" was never defined.
     23252Usually this means the macro was only invoked conditionally." >&5
     23253echo "$as_me: error: conditional \"COIN_HAS_LATEX\" was never defined.
     23254Usually this means the macro was only invoked conditionally." >&2;}
     23255   { (exit 1); exit 1; }; }
     23256fi
    2319123257
    2319223258: ${CONFIG_STATUS=./config.status}
     
    2346023526cat >&5 <<_CSEOF
    2346123527
    23462 This file was extended by Cbc $as_me 2.9.3, which was
     23528This file was extended by Cbc $as_me 2.9.4, which was
    2346323529generated by GNU Autoconf 2.59.  Invocation command line was
    2346423530
     
    2351823584cat >>$CONFIG_STATUS <<_ACEOF
    2351923585ac_cs_version="\\
    23520 Cbc config.status 2.9.3
     23586Cbc config.status 2.9.4
    2352123587configured by $0, generated by GNU Autoconf 2.59,
    2352223588  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
     
    2382323889s,@subdirs@,$subdirs,;t t
    2382423890s,@coin_have_doxygen@,$coin_have_doxygen,;t t
     23891s,@coin_have_latex@,$coin_have_latex,;t t
    2382523892s,@coin_doxy_usedot@,$coin_doxy_usedot,;t t
    2382623893s,@coin_doxy_tagname@,$coin_doxy_tagname,;t t
    2382723894s,@coin_doxy_logname@,$coin_doxy_logname,;t t
     23895s,@COIN_HAS_DOXYGEN_TRUE@,$COIN_HAS_DOXYGEN_TRUE,;t t
     23896s,@COIN_HAS_DOXYGEN_FALSE@,$COIN_HAS_DOXYGEN_FALSE,;t t
     23897s,@COIN_HAS_LATEX_TRUE@,$COIN_HAS_LATEX_TRUE,;t t
     23898s,@COIN_HAS_LATEX_FALSE@,$COIN_HAS_LATEX_FALSE,;t t
    2382823899s,@coin_doxy_tagfiles@,$coin_doxy_tagfiles,;t t
    2382923900s,@coin_doxy_excludes@,$coin_doxy_excludes,;t t
  • releases/2.9.4/configure.ac

    r2350 r2350  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.9.3],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.9.4],[cbc@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
Note: See TracChangeset for help on using the changeset viewer.