Changes from releases/2.7.7 at r2400 to releases/2.7.8 at r2400


Ignore:
Location:
releases/2.7.8
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • releases/2.7.8/Cbc

  • releases/2.7.8/Cbc/README

    r2400 r2400  
    2626==========
    2727
     28Release 2.7.8:
     29   Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.7&new_path=%2Freleases%2F2.7.8 to see all changes.
     30
     311. Change message when LP simplex iteration limit is hit from "Exiting on maximum nodes"
     32   to "Exiting on maximum number of iterations"
     33
     342. Fix for using overlapping SOS.
     35
     363. Fixes in buildsystem.
     37
    2838Release 2.7.7:
     39   Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.6&new_path=%2Freleases%2F2.7.7 to see all changes.
    2940
    30411. Fix to report interruption on user event if SIGINT is received by CbcSolver.
     
    3546
    3647Release 2.7.6:
    37    Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.5&old=1768&new_path=%2Freleases%2F2.7.6&new=1768 to see all changes.
     48   Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.5&new_path=%2Freleases%2F2.7.6 to see all changes.
    3849
    39501. Fixes to build system.
     
    4253
    4354Release 2.7.5:
    44    Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.4&old=1768&new_path=%2Freleases%2F2.7.5&new=1768 to see all changes.
     55   Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.4&new_path=%2Freleases%2F2.7.5 to see all changes.
    4556
    46571. Fixes to get AMPL interface working again.
     
    4960
    5061Release 2.7.4:
    51    Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.3&old=1759&new_path=%2Freleases%2F2.7.4&new=1759 to see all changes.
     62   Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.3&new_path=%2Freleases%2F2.7.4 to see all changes.
    5263
    53641. Minor bugfixes.
    5465
    5566Release 2.7.3:
    56    Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.2&old=1759&new_path=%2Freleases%2F2.7.3&new=1759 to see all changes.
     67   Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.2&new_path=%2Freleases%2F2.7.3 to see all changes.
    5768
    58691. Minor bugfixes.
     
    6172
    6273Release 2.7.2:
     74   Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.1&new_path=%2Freleases%2F2.7.2 to see all changes.
    6375
    64761. Allow row/column names for GMPL models.
     
    7991
    8092Release 2.7.1:
     93   Look at https://projects.coin-or.org/Cbc/changeset?old_path=%2Freleases%2F2.7.0&new_path=%2Freleases%2F2.7.1 to see all changes.
    8194
    82951. Fixes to MSVC++ files
  • releases/2.7.8/Cbc/configure

    r2400 r2400  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.7.7.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.7.8.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.7.7'
    433 PACKAGE_STRING='Cbc 2.7.7'
     432PACKAGE_VERSION='2.7.8'
     433PACKAGE_STRING='Cbc 2.7.8'
    434434PACKAGE_BUGREPORT='cbc@lists.coin-or.org'
    435435
     
    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.7.7 to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.7.8 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.7.7:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.7.8:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13041304if $ac_init_version; then
    13051305  cat <<\_ACEOF
    1306 Cbc configure 2.7.7
     1306Cbc configure 2.7.8
    13071307generated by GNU Autoconf 2.59
    13081308
     
    13241324running configure, to aid debugging if configure makes a mistake.
    13251325
    1326 It was created by Cbc $as_me 2.7.7, which was
     1326It was created by Cbc $as_me 2.7.8, which was
    13271327generated by GNU Autoconf 2.59.  Invocation command line was
    13281328
     
    18371837
    18381838    svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
    1839     if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x; then
     1839    if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x -a "x$svn_rev_tmp" != "xUnversioned directory"; then
    18401840      CBC_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    18411841
     
    18501850
    18511851# Capture libtool library version, if given.
    1852 coin_libversion=10:7:7
     1852coin_libversion=10:8:7
    18531853
    18541854
     
    46974697# Define the identity of the package.
    46984698 PACKAGE='cbc'
    4699  VERSION='2.7.7'
     4699 VERSION='2.7.8'
    47004700
    47014701
     
    2076620766# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    2076720767if test "x${prefix}" = xNONE ; then
    20768   COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    20769 else
    20770   COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20768  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib64/pkgconfig:${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20769else
     20770  COIN_PKG_CONFIG_PATH="${prefix}/lib64/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    2077120771fi
    2077220772
     
    2129721297     # construct dependencies variables from LIBS variables
    2129821298     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21299      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     21299     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2130021300     # then remove everything of the form -xxx
    2130121301     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21302      COINDEPEND_DEPENDENCIES=`echo " $COINDEPEND_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21303 
    21304        CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21305 
    21306        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21302     COINDEPEND_DEPENDENCIES=`echo " $COINDEPEND_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21303
     21304       CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21305
     21306       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2130721307
    2130821308  fi
     
    2184621846     # construct dependencies variables from LIBS variables
    2184721847     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21848      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     21848     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2184921849     # then remove everything of the form -xxx
    2185021850     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21851      CLP_DEPENDENCIES=`echo " $CLP_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21852 
    21853        CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21854 
    21855        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21851     CLP_DEPENDENCIES=`echo " $CLP_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21852
     21853       CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21854
     21855       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2185621856
    2185721857  fi
     
    2235322353     # construct dependencies variables from LIBS variables
    2235422354     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    22355      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     22355     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2235622356     # then remove everything of the form -xxx
    2235722357     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    22358      OSITESTS_DEPENDENCIES=`echo " $OSITESTS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22358     OSITESTS_DEPENDENCIES=`echo " $OSITESTS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2235922359
    2236022360  fi
     
    2283422834     # construct dependencies variables from LIBS variables
    2283522835     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    22836      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     22836     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2283722837     # then remove everything of the form -xxx
    2283822838     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    22839      SAMPLE_DEPENDENCIES=`echo " $SAMPLE_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22839     SAMPLE_DEPENDENCIES=`echo " $SAMPLE_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2284022840
    2284122841  fi
     
    2331523315     # construct dependencies variables from LIBS variables
    2331623316     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    23317      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     23317     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2331823318     # then remove everything of the form -xxx
    2331923319     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    23320      NETLIB_DEPENDENCIES=`echo " $NETLIB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     23320     NETLIB_DEPENDENCIES=`echo " $NETLIB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2332123321
    2332223322  fi
     
    2379623796     # construct dependencies variables from LIBS variables
    2379723797     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    23798      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     23798     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2379923799     # then remove everything of the form -xxx
    2380023800     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    23801      MIPLIB3_DEPENDENCIES=`echo " $MIPLIB3_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     23801     MIPLIB3_DEPENDENCIES=`echo " $MIPLIB3_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2380223802
    2380323803  fi
     
    2561025610     # construct dependencies variables from LIBS variables
    2561125611     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    25612      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     25612     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2561325613     # then remove everything of the form -xxx
    2561425614     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    25615      DYLP_DEPENDENCIES=`echo " $DYLP_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    25616 
    25617        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     25615     DYLP_DEPENDENCIES=`echo " $DYLP_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     25616
     25617       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2561825618
    2561925619  fi
     
    2610026100     # construct dependencies variables from LIBS variables
    2610126101     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    26102      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     26102     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2610326103     # then remove everything of the form -xxx
    2610426104     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    26105      VOL_DEPENDENCIES=`echo " $VOL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     26105     VOL_DEPENDENCIES=`echo " $VOL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2610626106
    2610726107  fi
     
    2662326623     # construct dependencies variables from LIBS variables
    2662426624     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    26625      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     26625     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2662626626     # then remove everything of the form -xxx
    2662726627     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    26628      CPX_DEPENDENCIES=`echo " $CPX_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    26629 
    26630        CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    26631 
    26632        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     26628     CPX_DEPENDENCIES=`echo " $CPX_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     26629
     26630       CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     26631
     26632       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2663326633
    2663426634  fi
     
    2714327143     # construct dependencies variables from LIBS variables
    2714427144     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    27145      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     27145     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2714627146     # then remove everything of the form -xxx
    2714727147     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    27148      GLPK_DEPENDENCIES=`echo " $GLPK_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    27149 
    27150        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     27148     GLPK_DEPENDENCIES=`echo " $GLPK_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     27149
     27150       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2715127151
    2715227152  fi
     
    2763327633     # construct dependencies variables from LIBS variables
    2763427634     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    27635      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     27635     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2763627636     # then remove everything of the form -xxx
    2763727637     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    27638      GRB_DEPENDENCIES=`echo " $GRB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     27638     GRB_DEPENDENCIES=`echo " $GRB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2763927639
    2764027640  fi
     
    2813528135     # construct dependencies variables from LIBS variables
    2813628136     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    28137      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     28137     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2813828138     # then remove everything of the form -xxx
    2813928139     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    28140      MSK_DEPENDENCIES=`echo " $MSK_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    28141 
    28142        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     28140     MSK_DEPENDENCIES=`echo " $MSK_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     28141
     28142       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2814328143
    2814428144  fi
     
    2864628646     # construct dependencies variables from LIBS variables
    2864728647     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    28648      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     28648     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2864928649     # then remove everything of the form -xxx
    2865028650     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    28651      SPX_DEPENDENCIES=`echo " $SPX_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    28652 
    28653        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     28651     SPX_DEPENDENCIES=`echo " $SPX_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     28652
     28653       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2865428654
    2865528655  fi
     
    2913629136     # construct dependencies variables from LIBS variables
    2913729137     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    29138      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     29138     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2913929139     # then remove everything of the form -xxx
    2914029140     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    29141      XPR_DEPENDENCIES=`echo " $XPR_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     29141     XPR_DEPENDENCIES=`echo " $XPR_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2914229142
    2914329143  fi
     
    2966529665     # construct dependencies variables from LIBS variables
    2966629666     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    29667      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     29667     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2966829668     # then remove everything of the form -xxx
    2966929669     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    29670      ASL_DEPENDENCIES=`echo " $ASL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    29671 
    29672        CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    29673 
    29674        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     29670     ASL_DEPENDENCIES=`echo " $ASL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     29671
     29672       CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     29673
     29674       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2967529675
    2967629676  fi
     
    3123031230cat >&5 <<_CSEOF
    3123131231
    31232 This file was extended by Cbc $as_me 2.7.7, which was
     31232This file was extended by Cbc $as_me 2.7.8, which was
    3123331233generated by GNU Autoconf 2.59.  Invocation command line was
    3123431234
     
    3129331293cat >>$CONFIG_STATUS <<_ACEOF
    3129431294ac_cs_version="\\
    31295 Cbc config.status 2.7.7
     31295Cbc config.status 2.7.8
    3129631296configured by $0, generated by GNU Autoconf 2.59,
    3129731297  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.7.8/Cbc/configure.ac

    r2400 r2400  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Cbc],[2.7.7],[cbc@lists.coin-or.org])
     15AC_INIT([Cbc],[2.7.8],[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,10:7:7)
     44AC_COIN_PROJECTDIR_INIT(Cbc,10:8:7)
    4545
    4646# Check if user wants to produce debugging code
  • releases/2.7.8/Cbc/src/CbcHeuristic.cpp

    r2400 r2400  
    12661266                }
    12671267                if (model.status() == 5)
    1268                     returnCode = -2; // stop
     1268                  model_->sayEventHappened();
    12691269                if (model.isProvenInfeasible())
    12701270                    status = 1;
  • releases/2.7.8/Cbc/src/CbcHeuristicGreedy.cpp

    r2400 r2400  
    11191119            nextGub[jColumn]=iColumn;
    11201120          }
     1121          // Only in one sos
     1122          break;
    11211123        }
    11221124      }
  • releases/2.7.8/Cbc/src/CbcMessage.cpp

    r2400 r2400  
    6969    {CBC_FATHOM_CHANGE, 49, 1, "Complete fathoming at depth >= %d"},
    7070#endif
     71    {CBC_MAXITERS, 50, 1, "Exiting on maximum number of iterations"},
    7172    {CBC_NOINT, 3007, 1, "No integer variables - nothing to do"},
    7273    {CBC_WARNING_STRONG, 3008, 1, "Strong branching is fixing too many variables, too expensively!"},
  • releases/2.7.8/Cbc/src/CbcMessage.hpp

    r2400 r2400  
    2828    CBC_MAXSOLS,
    2929    CBC_EVENT,
     30    CBC_MAXITERS,
    3031    CBC_SOLUTION,
    3132    CBC_END_SOLUTION,
  • releases/2.7.8/Cbc/src/CbcModel.cpp

    r2400 r2400  
    39303930    */
    39313931    if (!(numberNodes_ < intParam_[CbcMaxNumNode] &&
    3932             numberSolutions_ < intParam_[CbcMaxNumSol] &&
    3933             !maximumSecondsReached() &&
    3934             !stoppedOnGap_ && !eventHappened_ && (maximumNumberIterations_ < 0 ||
    3935                                                   numberIterations_ < maximumNumberIterations_))) {
     3932          numberSolutions_ < intParam_[CbcMaxNumSol] &&
     3933          !maximumSecondsReached() &&
     3934          !stoppedOnGap_ &&
     3935          !eventHappened_ &&
     3936          (maximumNumberIterations_ < 0 || numberIterations_ < maximumNumberIterations_))
     3937         ) {
    39363938        if (tree_->size()) {
    39373939            double dummyBest;
     
    39653967            secondaryStatus_ = 3;
    39663968            status_ = 1 ;
     3969        } else if (maximumNumberIterations_ >= 0 && numberIterations_ >= maximumNumberIterations_) {
     3970           handler_->message(CBC_MAXITERS, messages_) << CoinMessageEol ;
     3971           secondaryStatus_ = 3; /* do not have secondary status for iterlimit yet, so pretend nodelimit */
     3972           status_ = 1 ;
    39673973        } else {
     3974            assert(numberSolutions_ >= intParam_[CbcMaxNumSol]);
    39683975            handler_->message(CBC_MAXSOLS, messages_) << CoinMessageEol ;
    39693976            secondaryStatus_ = 6;
  • releases/2.7.8/Cbc/src/CbcModel.hpp

    r2400 r2400  
    11761176        Returns objective value (worse than cutoff if not feasible)
    11771177        Previously computed objective value is now passed in (in case user does not do solve)
    1178     */
    1179     double checkSolution(double cutoff, double * solution,
     1178        virtual so user can override
     1179    */
     1180    virtual double checkSolution(double cutoff, double * solution,
    11801181                         int fixVariables, double originalObjValue);
    11811182    /** Test the current solution for feasiblility.
     
    18411842
    18421843    /// Destructor
    1843     ~CbcModel ();
     1844    virtual ~CbcModel ();
    18441845
    18451846    /// Returns solver - has current state
  • releases/2.7.8/Cbc/src/config_cbc_default.h

    r2400 r2400  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.7.7"
     8#define CBC_VERSION "2.7.8"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define CBC_VERSION_RELEASE 7
     17#define CBC_VERSION_RELEASE 8
  • releases/2.7.8/configure

    r2400 r2400  
    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.7.7.
     4# Generated by GNU Autoconf 2.59 for Cbc 2.7.8.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='2.7.7'
    434 PACKAGE_STRING='Cbc 2.7.7'
     433PACKAGE_VERSION='2.7.8'
     434PACKAGE_STRING='Cbc 2.7.8'
    435435PACKAGE_BUGREPORT='cbc@lists.coin-or.org'
    436436
     
    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.7.7 to adapt to many kinds of systems.
     1041\`configure' configures Cbc 2.7.8 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.7.7:";;
     1107     short | recursive ) echo "Configuration of Cbc 2.7.8:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13311331if $ac_init_version; then
    13321332  cat <<\_ACEOF
    1333 Cbc configure 2.7.7
     1333Cbc configure 2.7.8
    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.7.7, which was
     1353It was created by Cbc $as_me 2.7.8, which was
    13541354generated by GNU Autoconf 2.59.  Invocation command line was
    13551355
     
    53045304# Define the identity of the package.
    53055305 PACKAGE='cbc'
    5306  VERSION='2.7.7'
     5306 VERSION='2.7.8'
    53075307
    53085308
     
    2359523595cat >&5 <<_CSEOF
    2359623596
    23597 This file was extended by Cbc $as_me 2.7.7, which was
     23597This file was extended by Cbc $as_me 2.7.8, which was
    2359823598generated by GNU Autoconf 2.59.  Invocation command line was
    2359923599
     
    2365323653cat >>$CONFIG_STATUS <<_ACEOF
    2365423654ac_cs_version="\\
    23655 Cbc config.status 2.7.7
     23655Cbc config.status 2.7.8
    2365623656configured by $0, generated by GNU Autoconf 2.59,
    2365723657  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.7.8/configure.ac

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