Changes from releases/2.7.6 at r1788 to releases/2.7.7 at r1788


Ignore:
Location:
releases/2.7.7
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • releases/2.7.7/Cbc

  • releases/2.7.7/Cbc/README

    r1788 r1788  
    2626==========
    2727
     28Release 2.7.7:
     29
     301. Fix to report interruption on user event if SIGINT is received by CbcSolver.
     31   model->status() should now be 5 if this event happened.
     32   Added method CbcModel::sayEventHappened() to make cbc stop due to an 'user event'.
     33
     342. Other minor fixes.
     35
     36Release 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.
     38
     391. Fixes to build system.
     40
     412. Other minor fixes.
     42
     43Release 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.
     45
     461. Fixes to get AMPL interface working again.
     47
     482. More fixes to MSVC++ files.
     49
     50Release 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.
     52
     531. Minor bugfixes.
     54
     55Release 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.
     57
     581. Minor bugfixes.
     59
     602. Fixes to MSVC++ files.
     61
     62Release 2.7.2:
     63
     641. Allow row/column names for GMPL models.
     65
     662. Added CbcModel::haveMultiThreadSupport() to indicate whether Cbc library has been compiled with multithread support.
     67
     683. Added CbcModel::waitingForMiniBranchAndBound() to indicate whether sub-MIP heuristic is currently running.
     69
     704. Cbc shell should work with readline if configured with --enable-gnu-packages.
     71
     725. Support for compressed input files (.gz, .bz2) is now enabled by default.
     73
     746. Fix problems with relative gap tolerance > 100% and further bugs.
     75
     767. Fixes for MSVC++ Version 9 files.
     77
     788. Minor fixes in buildsystem; update to BuildTools 0.7.1.
     79
    2880Release 2.7.1:
    2981
     
    3789
    38903. Support for BuildTools version 0.7 to incorporate recent enhancements,
    39 including proper library versioning in Linux, prohibiting installation of
    40 private headers, etc.
     91   including proper library versioning in Linux, prohibiting installation of
     92   private headers, etc.
    4193
    42944. Updated externals to new stable versions of dependent projects.
  • releases/2.7.7/Cbc/configure

    r1788 r1788  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.7.6.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.7.7.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.7.6'
    433 PACKAGE_STRING='Cbc 2.7.6'
     432PACKAGE_VERSION='2.7.7'
     433PACKAGE_STRING='Cbc 2.7.7'
    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.6 to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.7.7 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.6:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.7.7:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13041304if $ac_init_version; then
    13051305  cat <<\_ACEOF
    1306 Cbc configure 2.7.6
     1306Cbc configure 2.7.7
    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.6, which was
     1326It was created by Cbc $as_me 2.7.7, which was
    13271327generated by GNU Autoconf 2.59.  Invocation command line was
    13281328
     
    18501850
    18511851# Capture libtool library version, if given.
    1852 coin_libversion=10:6:7
     1852coin_libversion=10:7:7
    18531853
    18541854
     
    46974697# Define the identity of the package.
    46984698 PACKAGE='cbc'
    4699  VERSION='2.7.6'
     4699 VERSION='2.7.7'
    47004700
    47014701
     
    3123031230cat >&5 <<_CSEOF
    3123131231
    31232 This file was extended by Cbc $as_me 2.7.6, which was
     31232This file was extended by Cbc $as_me 2.7.7, 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.6
     31295Cbc config.status 2.7.7
    3129631296configured by $0, generated by GNU Autoconf 2.59,
    3129731297  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.7.7/Cbc/configure.ac

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

    r1788 r1788  
    13271327            if (!rowLength[i]) {
    13281328                del[nDel++] = i;
    1329                 possibleRow[i] = 1;
    13301329            } else if (possibleRow[i]) {
    13311330                if (rowLength[i] == 1) {
     
    14121411        if (nDel) {
    14131412            copy2->deleteRows(nDel, del);
     1413            // pack down possible
     1414            int n=0;
     1415            for (int i=0;i<nDel;i++)
     1416              possibleRow[del[i]]=-1;
     1417            for (int i=0;i<numberRows;i++) {
     1418              if (possibleRow[i]>=0)
     1419                possibleRow[n++]=possibleRow[i];
     1420            }
    14141421        }
    14151422        if (nDel != numberRows) {
     
    14711478                    break;
    14721479                }
     1480                if (possibleRow[i]==0) {
     1481                    couldBeNetwork = false;
     1482                    break;
     1483                }
    14731484            }
    14741485            if (couldBeNetwork) {
     
    39283939        }
    39293940        delete nextRowCut_;
     3941        /* order is important here:
     3942         * maximumSecondsReached() should be checked before eventHappened_ and
     3943         * isNodeLimitReached() should be checked after eventHappened_
     3944         * reason is, that at timelimit, eventHappened_ is set to true to make Cbc stop fast
     3945         *   and if Ctrl+C is hit, then the nodelimit is set to -1 to make Cbc stop
     3946         */
    39303947        if (stoppedOnGap_) {
    39313948            messageHandler()->message(CBC_GAP, messages())
     
    39363953            secondaryStatus_ = 2;
    39373954            status_ = 0 ;
    3938         } else if (isNodeLimitReached()) {
    3939             handler_->message(CBC_MAXNODES, messages_) << CoinMessageEol ;
    3940             secondaryStatus_ = 3;
    3941             status_ = 1 ;
    39423955        } else if (maximumSecondsReached()) {
    39433956            handler_->message(CBC_MAXTIME, messages_) << CoinMessageEol ;
     
    39483961            secondaryStatus_ = 5;
    39493962            status_ = 5 ;
     3963        } else if (isNodeLimitReached()) {
     3964            handler_->message(CBC_MAXNODES, messages_) << CoinMessageEol ;
     3965            secondaryStatus_ = 3;
     3966            status_ = 1 ;
    39503967        } else {
    39513968            handler_->message(CBC_MAXSOLS, messages_) << CoinMessageEol ;
     
    41864203    if (bestSolution_ && (solverCharacteristics_->solverType() < 2 || solverCharacteristics_->solverType() == 4)) {
    41874204        setCutoff(1.0e50) ; // As best solution should be worse than cutoff
     4205        // also in continuousSolver_
     4206        if (continuousSolver_) {
     4207          // Solvers know about direction
     4208          double direction = solver_->getObjSense();
     4209          continuousSolver_->setDblParam(OsiDualObjectiveLimit, 1.0e50*direction);
     4210        }
    41884211        phase_ = 5;
    41894212        double increment = getDblParam(CbcModel::CbcCutoffIncrement) ;
     
    1124711270              NB - Not all of this if from solve with cuts
    1124811271            */
    11249             saveBestSolution(solution, objectiveValue);
     11272            saveBestSolution(candidate, objectiveValue);
    1125011273            //bestObjective_ = objectiveValue;
    1125111274            //int numberColumns = solver_->getNumCols();
  • releases/2.7.7/Cbc/src/CbcModel.hpp

    r1788 r1788  
    17311731        return specialOptions_;
    17321732    }
     1733    /// Tell model to stop on event
     1734    inline void sayEventHappened()
     1735    { eventHappened_=true;}
    17331736    /// Says if normal solver i.e. has well defined CoinPackedMatrix
    17341737    inline bool normalSolver() const {
  • releases/2.7.7/Cbc/src/CbcSolver.cpp

    r1788 r1788  
    802802            currentBranchModel->setMaximumNodes(0); // stop at next node
    803803            currentBranchModel->setMaximumSeconds(0.0); // stop
     804            currentBranchModel->sayEventHappened(); // say why stopped
    804805        }
    805806        return;
     
    61496150                                if (!iStat && !iStat2 && !bestSolution)
    61506151                                    iStat2 = 8;
     6152                                if (!iStat && iStat2==1 && bestSolution)
     6153                                  iStat2 = 0; // solution and search completed
    61516154                                statistics_seconds = time2 - time1;
    61526155                                statistics_sys_seconds = CoinSysTime();
  • releases/2.7.7/Cbc/src/config_cbc_default.h

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

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

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