Changes from releases/2.8.10 at r2366 to releases/2.8.9 at r2366


Ignore:
Location:
releases/2.8.9
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • releases/2.8.9/Cbc/configure

    r2366 r2366  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Cbc 2.8.10.
     3# Generated by GNU Autoconf 2.59 for Cbc 2.8.9.
    44#
    55# Report bugs to <cbc@lists.coin-or.org>.
     
    430430PACKAGE_NAME='Cbc'
    431431PACKAGE_TARNAME='cbc'
    432 PACKAGE_VERSION='2.8.10'
    433 PACKAGE_STRING='Cbc 2.8.10'
     432PACKAGE_VERSION='2.8.9'
     433PACKAGE_STRING='Cbc 2.8.9'
    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.8.10 to adapt to many kinds of systems.
     1008\`configure' configures Cbc 2.8.9 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.8.10:";;
     1074     short | recursive ) echo "Configuration of Cbc 2.8.9:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    13061306if $ac_init_version; then
    13071307  cat <<\_ACEOF
    1308 Cbc configure 2.8.10
     1308Cbc configure 2.8.9
    13091309generated by GNU Autoconf 2.59
    13101310
     
    13261326running configure, to aid debugging if configure makes a mistake.
    13271327
    1328 It was created by Cbc $as_me 2.8.10, which was
     1328It was created by Cbc $as_me 2.8.9, which was
    13291329generated by GNU Autoconf 2.59.  Invocation command line was
    13301330
     
    18521852
    18531853# Capture libtool library version, if given.
    1854  coin_libversion=11:10:8
     1854 coin_libversion=11:9:8
    18551855
    18561856
     
    19881988    esac
    19891989  fi
     1990
     1991
     1992 case $build in
     1993  *-mingw*)
     1994    if test "${LD+set}" = set; then :; else
     1995      LD=link
     1996    fi
     1997    ;;
     1998 esac
     1999 if test $enable_msvc = yes ; then
     2000   if test "x${LD+set}" = xset; then :; else
     2001     LD=link
     2002   fi
     2003 fi
     2004
    19902005
    19912006
     
    32103225  clang* ) ;;
    32113226  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3212     LD=link
     3227
     3228 case $build in
     3229  *-mingw*)
     3230    if test "${LD+set}" = set; then :; else
     3231      LD=link
     3232    fi
     3233    ;;
     3234 esac
     3235 if test $enable_msvc = yes ; then
     3236   if test "x${LD+set}" = xset; then :; else
     3237     LD=link
     3238   fi
     3239 fi
     3240
    32133241    ;;
    32143242esac
     
    40864114fi
    40874115
    4088 # correct the LD variable in a build with MS or intel compiler
     4116# correct the LD variable in a mingw build with MS or intel compiler
    40894117case "$CXX" in
    40904118  clang* ) ;;
    40914119  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    4092     LD=link
     4120
     4121 case $build in
     4122  *-mingw*)
     4123    if test "${LD+set}" = set; then :; else
     4124      LD=link
     4125    fi
     4126    ;;
     4127 esac
     4128 if test $enable_msvc = yes ; then
     4129   if test "x${LD+set}" = xset; then :; else
     4130     LD=link
     4131   fi
     4132 fi
     4133
    40934134    ;;
    40944135esac
     
    45744615# Define the identity of the package.
    45754616 PACKAGE='cbc'
    4576  VERSION='2.8.10'
     4617 VERSION='2.8.9'
    45774618
    45784619
     
    58705911*-*-irix6*)
    58715912  # Find out which ABI we are using.
    5872   echo '#line 5872 "configure"' > conftest.$ac_ext
     5913  echo '#line 5913 "configure"' > conftest.$ac_ext
    58735914  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58745915  (eval $ac_compile) 2>&5
     
    70047045
    70057046# Provide some information about the compiler.
    7006 echo "$as_me:7006:" \
     7047echo "$as_me:7047:" \
    70077048     "checking for Fortran 77 compiler version" >&5
    70087049ac_compiler=`set X $ac_compile; echo $2`
     
    80718112   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80728113   -e 's:$: $lt_compiler_flag:'`
    8073    (eval echo "\"\$as_me:8073: $lt_compile\"" >&5)
     8114   (eval echo "\"\$as_me:8114: $lt_compile\"" >&5)
    80748115   (eval "$lt_compile" 2>conftest.err)
    80758116   ac_status=$?
    80768117   cat conftest.err >&5
    8077    echo "$as_me:8077: \$? = $ac_status" >&5
     8118   echo "$as_me:8118: \$? = $ac_status" >&5
    80788119   if (exit $ac_status) && test -s "$ac_outfile"; then
    80798120     # The compiler can only warn and ignore the option if not recognized
     
    83398380   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83408381   -e 's:$: $lt_compiler_flag:'`
    8341    (eval echo "\"\$as_me:8341: $lt_compile\"" >&5)
     8382   (eval echo "\"\$as_me:8382: $lt_compile\"" >&5)
    83428383   (eval "$lt_compile" 2>conftest.err)
    83438384   ac_status=$?
    83448385   cat conftest.err >&5
    8345    echo "$as_me:8345: \$? = $ac_status" >&5
     8386   echo "$as_me:8386: \$? = $ac_status" >&5
    83468387   if (exit $ac_status) && test -s "$ac_outfile"; then
    83478388     # The compiler can only warn and ignore the option if not recognized
     
    84438484   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84448485   -e 's:$: $lt_compiler_flag:'`
    8445    (eval echo "\"\$as_me:8445: $lt_compile\"" >&5)
     8486   (eval echo "\"\$as_me:8486: $lt_compile\"" >&5)
    84468487   (eval "$lt_compile" 2>out/conftest.err)
    84478488   ac_status=$?
    84488489   cat out/conftest.err >&5
    8449    echo "$as_me:8449: \$? = $ac_status" >&5
     8490   echo "$as_me:8490: \$? = $ac_status" >&5
    84508491   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84518492   then
     
    1078810829  lt_status=$lt_dlunknown
    1078910830  cat > conftest.$ac_ext <<EOF
    10790 #line 10790 "configure"
     10831#line 10831 "configure"
    1079110832#include "confdefs.h"
    1079210833
     
    1088810929  lt_status=$lt_dlunknown
    1088910930  cat > conftest.$ac_ext <<EOF
    10890 #line 10890 "configure"
     10931#line 10931 "configure"
    1089110932#include "confdefs.h"
    1089210933
     
    1323213273   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1323313274   -e 's:$: $lt_compiler_flag:'`
    13234    (eval echo "\"\$as_me:13234: $lt_compile\"" >&5)
     13275   (eval echo "\"\$as_me:13275: $lt_compile\"" >&5)
    1323513276   (eval "$lt_compile" 2>conftest.err)
    1323613277   ac_status=$?
    1323713278   cat conftest.err >&5
    13238    echo "$as_me:13238: \$? = $ac_status" >&5
     13279   echo "$as_me:13279: \$? = $ac_status" >&5
    1323913280   if (exit $ac_status) && test -s "$ac_outfile"; then
    1324013281     # The compiler can only warn and ignore the option if not recognized
     
    1333613377   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1333713378   -e 's:$: $lt_compiler_flag:'`
    13338    (eval echo "\"\$as_me:13338: $lt_compile\"" >&5)
     13379   (eval echo "\"\$as_me:13379: $lt_compile\"" >&5)
    1333913380   (eval "$lt_compile" 2>out/conftest.err)
    1334013381   ac_status=$?
    1334113382   cat out/conftest.err >&5
    13342    echo "$as_me:13342: \$? = $ac_status" >&5
     13383   echo "$as_me:13383: \$? = $ac_status" >&5
    1334313384   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1334413385   then
     
    1490614947   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1490714948   -e 's:$: $lt_compiler_flag:'`
    14908    (eval echo "\"\$as_me:14908: $lt_compile\"" >&5)
     14949   (eval echo "\"\$as_me:14949: $lt_compile\"" >&5)
    1490914950   (eval "$lt_compile" 2>conftest.err)
    1491014951   ac_status=$?
    1491114952   cat conftest.err >&5
    14912    echo "$as_me:14912: \$? = $ac_status" >&5
     14953   echo "$as_me:14953: \$? = $ac_status" >&5
    1491314954   if (exit $ac_status) && test -s "$ac_outfile"; then
    1491414955     # The compiler can only warn and ignore the option if not recognized
     
    1501015051   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1501115052   -e 's:$: $lt_compiler_flag:'`
    15012    (eval echo "\"\$as_me:15012: $lt_compile\"" >&5)
     15053   (eval echo "\"\$as_me:15053: $lt_compile\"" >&5)
    1501315054   (eval "$lt_compile" 2>out/conftest.err)
    1501415055   ac_status=$?
    1501515056   cat out/conftest.err >&5
    15016    echo "$as_me:15016: \$? = $ac_status" >&5
     15057   echo "$as_me:15057: \$? = $ac_status" >&5
    1501715058   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1501815059   then
     
    1721717258   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1721817259   -e 's:$: $lt_compiler_flag:'`
    17219    (eval echo "\"\$as_me:17219: $lt_compile\"" >&5)
     17260   (eval echo "\"\$as_me:17260: $lt_compile\"" >&5)
    1722017261   (eval "$lt_compile" 2>conftest.err)
    1722117262   ac_status=$?
    1722217263   cat conftest.err >&5
    17223    echo "$as_me:17223: \$? = $ac_status" >&5
     17264   echo "$as_me:17264: \$? = $ac_status" >&5
    1722417265   if (exit $ac_status) && test -s "$ac_outfile"; then
    1722517266     # The compiler can only warn and ignore the option if not recognized
     
    1748517526   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1748617527   -e 's:$: $lt_compiler_flag:'`
    17487    (eval echo "\"\$as_me:17487: $lt_compile\"" >&5)
     17528   (eval echo "\"\$as_me:17528: $lt_compile\"" >&5)
    1748817529   (eval "$lt_compile" 2>conftest.err)
    1748917530   ac_status=$?
    1749017531   cat conftest.err >&5
    17491    echo "$as_me:17491: \$? = $ac_status" >&5
     17532   echo "$as_me:17532: \$? = $ac_status" >&5
    1749217533   if (exit $ac_status) && test -s "$ac_outfile"; then
    1749317534     # The compiler can only warn and ignore the option if not recognized
     
    1758917630   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1759017631   -e 's:$: $lt_compiler_flag:'`
    17591    (eval echo "\"\$as_me:17591: $lt_compile\"" >&5)
     17632   (eval echo "\"\$as_me:17632: $lt_compile\"" >&5)
    1759217633   (eval "$lt_compile" 2>out/conftest.err)
    1759317634   ac_status=$?
    1759417635   cat out/conftest.err >&5
    17595    echo "$as_me:17595: \$? = $ac_status" >&5
     17636   echo "$as_me:17636: \$? = $ac_status" >&5
    1759617637   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1759717638   then
     
    3115931200cat >&5 <<_CSEOF
    3116031201
    31161 This file was extended by Cbc $as_me 2.8.10, which was
     31202This file was extended by Cbc $as_me 2.8.9, which was
    3116231203generated by GNU Autoconf 2.59.  Invocation command line was
    3116331204
     
    3122231263cat >>$CONFIG_STATUS <<_ACEOF
    3122331264ac_cs_version="\\
    31224 Cbc config.status 2.8.10
     31265Cbc config.status 2.8.9
    3122531266configured by $0, generated by GNU Autoconf 2.59,
    3122631267  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.8.9/Cbc/configure.ac

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

    r2366 r2366  
    1111#include <OsiSolverInterface.hpp>
    1212#include "CbcMessage.hpp"
    13 #include "CbcHeuristic.hpp"
    1413#include <CbcModel.hpp>
    1514#include "CbcMipStartIO.hpp"
     
    2423
    2524   for ( size_t i=0 ; i<l ; ++i )
    26      if (!(isdigit(str[i])||(str[i]=='.')||(str[i]=='-')))
     25      if (!(isdigit(str[i])||(str[i]=='.')))
    2726         return false;
    2827
     
    8281      model->messageHandler()->message(CBC_GENERAL, model->messages())
    8382        << printLine << CoinMessageEol;
    84       if (colValues.size()<model->getNumCols()) {
    85         int numberColumns = model->getNumCols();
    86         OsiSolverInterface * solver = model->solver();
    87         vector< pair< string, double > > fullValues;
    88         /* for fast search of column names */
    89         map< string, int > colIdx;
    90         for (int i=0;i<numberColumns;i++) {
    91           fullValues.push_back( pair<string, double>(solver->getColName(i),0.0) );
    92           colIdx[solver->getColName(i)] = i;
    93         }
    94         for ( int i=0 ; (i<(int)colValues.size()) ; ++i )
    95           {
    96             map< string, int >::const_iterator mIt = colIdx.find( colValues[i].first );
    97             if ( mIt != colIdx.end() ) {
    98               const int idx = mIt->second;
    99               double v = colValues[i].second;
    100               fullValues[idx].second=v;
    101             }
    102           }
    103         colValues=fullValues;
    104       }
    10583   } else
    10684   {
     
    135113   int notFound = 0;
    136114   char colNotFound[256] = "";
    137    int nContinuousFixed = 0;
    138115   for ( int i=0 ; (i<(int)colValues.size()) ; ++i )
    139116   {
     
    153130         if (lp->isInteger(idx))  // just to avoid small
    154131            v = floor( v+0.5 );   // fractional garbage
    155          else
    156            nContinuousFixed++;
    157132         lp->setColBounds( idx, v, v );
    158133         ++fixed;
     
    179154      model->messageHandler()->message(CBC_GENERAL, model->messages())
    180155        << "Warning: mipstart values could not be used to build a solution." << CoinMessageEol;
    181       if (nContinuousFixed) {
    182         model->messageHandler()->message(CBC_GENERAL, model->messages())
    183           << "Trying just fixing integer variables." << CoinMessageEol;
    184         int numberColumns = lp->getNumCols();
    185         const double * oldLower = model->solver()->getColLower();
    186         const double * oldUpper = model->solver()->getColUpper();
    187         for ( int i=0 ; i<numberColumns ; ++i ) {
    188           if (!lp->isInteger(i)) {
    189             lp->setColLower(i,oldLower[i]);
    190             lp->setColUpper(i,oldUpper[i]);
    191           }
    192         }
    193         lp->initialSolve();
    194         if (!lp->isProvenOptimal())
    195           model->messageHandler()->message(CBC_GENERAL, model->messages())
    196             << "Still no good." << CoinMessageEol;
    197       }
    198       if (!lp->isProvenOptimal()) {
    199         status = 1;
    200         goto TERMINATE;
    201       }
     156      status = 1;
     157      goto TERMINATE;
    202158   }
    203159
     
    209165        << printLine << CoinMessageEol;
    210166      double start = CoinCpuTime();
    211 #if 1
    212       CbcSerendipity heuristic(*model);
    213       heuristic.setFractionSmall(2.0);
    214       heuristic.setFeasibilityPumpOptions(1008013);
    215       int returnCode = heuristic.smallBranchAndBound(lp,
    216                                                      1000, sol,
    217                                                      compObj,
    218                                                      model->getCutoff(),
    219                                                      "ReduceInMIPStart");
    220       if ((returnCode&1) != 0) {
    221          sprintf( printLine,"Mini branch and bound defined values for remaining variables in %.2f seconds.",
    222                   CoinCpuTime()-start);
    223          model->messageHandler()->message(CBC_GENERAL, model->messages())
    224            << printLine << CoinMessageEol;
    225          foundIntegerSol = true;
    226          obj = compObj;
    227       }
    228 #else
    229167      CbcModel babModel( *lp );
    230168      babModel.setLogLevel( 0 );
     
    242180         obj = compObj = babModel.getObjValue();
    243181      }
    244 #endif
    245182      else
    246183      {
  • releases/2.8.9/Cbc/src/CbcModel.cpp

    r2366 r2366  
    43794379            //MODIF PIERRE
    43804380            bestPossibleObjective_ = tree_->getBestPossibleObjective();
    4381 #ifdef CBC_THREAD
    4382             if (parallelMode() > 0 && master_) {
    4383               // need to adjust for ones not on tree
    4384               int numberThreads = master_->numberThreads();
    4385               for (int i=0;i<numberThreads;i++) {
    4386                 CbcThread * child = master_->child(i);
    4387                 if (child->node()) {
    4388                   // adjust
    4389                   double value = child->node()->objectiveValue();
    4390                   bestPossibleObjective_ = CoinMin(bestPossibleObjective_, value);
    4391                 }
    4392               }
    4393             }
    4394 #endif
    43954381            unlockThread();
    43964382#ifdef CLP_INVESTIGATE
     
    50485034    originalContinuousObjective_ = solver_->getObjValue() * solver_->getObjSense();
    50495035    bestPossibleObjective_ = originalContinuousObjective_;
    5050     if (solver_->isProvenDualInfeasible())
    5051       originalContinuousObjective_ = -COIN_DBL_MAX;
    50525036    delete [] continuousSolution_;
    50535037    continuousSolution_ = CoinCopyOfArray(solver_->getColSolution(),
     
    65926576CbcModel::isProvenInfeasible() const
    65936577{
    6594   if (!status_ && (bestObjective_ >= 1.0e30 
    6595                    && (secondaryStatus_==0||secondaryStatus_==1)))
     6578    if (!status_ && bestObjective_ >= 1.0e30)
    65966579        return true;
    65976580    else
     
    1312613109{
    1312713110    if (status_ != -1) {
    13128         return fabs(originalContinuousObjective_) < 1.0e50;
     13111        return originalContinuousObjective_ < 1.0e50;
    1312913112    } else {
    1313013113        return solver_->isProvenOptimal();
     
    1688616869    bool hitMaxTime = (totalTime >= maxSeconds);
    1688716870    if (parentModel_ && !hitMaxTime) {
    16888         // In a sub tree
    16889         assert (parentModel_);
     16871        // In a sub tree so need to add both times
     16872        totalTime += parentModel_->getCurrentSeconds();
    1689016873        maxSeconds = parentModel_->getMaximumSeconds();
    1689116874        hitMaxTime = (totalTime >= maxSeconds);
  • releases/2.8.9/Cbc/src/CbcModel.hpp

    r2366 r2366  
    20412041        }
    20422042    }
    2043     /// Thread stuff for master
    2044     inline CbcBaseModel * master() const
    2045     { return master_;}
    20462043    /// From here to end of section - code in CbcThread.cpp until class changed
    20472044    /// Returns true if locked
  • releases/2.8.9/Cbc/src/CbcSolver.cpp

    r2366 r2366  
    16091609                // modify objective if necessary
    16101610                solver->setObjSense(info.direction);
    1611                 solver->setDblParam(OsiObjOffset, -info.offset);
     1611                solver->setDblParam(OsiObjOffset, info.offset);
    16121612                if (info.offset) {
    16131613                    sprintf(generalPrint, "Ampl objective offset is %g",
     
    39893989                                        numberPasses = (tunePreProcess / 1000000) - 1;
    39903990                                        tunePreProcess = tunePreProcess % 1000000;
    3991                                     } else if (tunePreProcess >= 10000) {
    3992                                         numberPasses = (tunePreProcess / 10000) - 1;
    3993                                         tunePreProcess = tunePreProcess % 10000;
     3991                                    } else if (tunePreProcess >= 1000) {
     3992                                        numberPasses = (tunePreProcess / 1000) - 1;
     3993                                        tunePreProcess = tunePreProcess % 1000;
    39943994                                    }
    39953995#ifndef CBC_OTHER_SOLVER
     
    50945094#endif
    50955095                                const int * originalColumns = preProcess ? process.originalColumns() : NULL;
    5096                                 if (mipStart.size() && !mipStartBefore.size())
     5096                                if (mipStart.size())
    50975097                                {
    50985098                                   std::vector< std::string > colNames;
    50995099                                   if (preProcess)
    51005100                                   {
    5101                                      std::vector< std::pair< std::string, double > > mipStart2;
    51025101                                     for ( int i=0 ; (i<babModel_->solver()->getNumCols()) ; ++i ) {
    51035102                                       int iColumn = babModel_->originalColumns()[i];
    51045103                                       if (iColumn>=0) {
    51055104                                         colNames.push_back( model_.solver()->getColName( iColumn ) );
    5106                                          babModel_->solver()->setColName(i,model_.solver()->getColName(iColumn));
    5107                                          mipStart2.push_back(mipStart[iColumn]);
    51085105                                       } else {
    51095106                                         // created variable
     
    51135110                                       }
    51145111                                     }
    5115                                      mipStart = mipStart2;
    51165112                                   } else {
    51175113                                      for ( int i=0 ; (i<babModel_->solver()->getNumCols()) ; ++i )
     
    87598755                                }
    87608756                                    // Write solution header (suggested by Luigi Poderico)
    8761                                     // Refresh solver
    8762                                     lpSolver = clpSolver->getModelPtr();
    87638757                                    lpSolver->computeObjectiveValue(false);
    87648758                                    double objValue = lpSolver->getObjValue();
  • releases/2.8.9/Cbc/src/CbcThread.hpp

    r2366 r2366  
    389389        return threadModel_[i];
    390390    }
    391  
    392     /// Returns pointer to a child thread
    393     inline CbcThread * child(int thread) const
    394     { return children_+thread;}
    395 
    396     /// Returns number of children
    397     inline int numberThreads() const
    398     { return numberThreads_;}
    399391
    400392    /// Sets Dantzig state in children
  • releases/2.8.9/Cbc/src/CbcTree.cpp

    r2366 r2366  
    77#include "CbcNode.hpp"
    88#include "CbcTree.hpp"
    9 #include "CbcThread.hpp"
    109#include "CbcCountRowCut.hpp"
    1110#include "CbcCompareActual.hpp"
     
    643642    delete [] nodeArray;
    644643    delete [] depth;
    645 #ifdef CBC_THREAD
    646     if (model->parallelMode() > 0 && model->master()) {
    647       // need to adjust for ones not on tree
    648       CbcBaseModel * master = model->master();
    649       int numberThreads = master->numberThreads();
    650       for (int i=0;i<numberThreads;i++) {
    651         CbcThread * child = master->child(i);
    652         if (child->node()) {
    653           // adjust
    654           double value = child->node()->objectiveValue();
    655           bestPossibleObjective = CoinMin(bestPossibleObjective, value);
    656         }
    657       }
    658     }
    659 #endif
    660644}
    661645
     
    924908        bestPossibleObjective = CoinMin(bestPossibleObjective, lastNode_->objectiveValue());
    925909    }
    926 #ifdef CBC_THREAD
    927     if (model->parallelMode() > 0 && model->master()) {
    928       // need to adjust for ones not on tree
    929       CbcBaseModel * master = model->master();
    930       int numberThreads = master->numberThreads();
    931       for (int i=0;i<numberThreads;i++) {
    932         CbcThread * child = master->child(i);
    933         if (child->node()) {
    934           // adjust
    935           double value = child->node()->objectiveValue();
    936           bestPossibleObjective = CoinMin(bestPossibleObjective, value);
    937         }
    938       }
    939     }
    940 #endif
    941910    CbcCompareDefault * compareDefault
    942911    = dynamic_cast<CbcCompareDefault *> (comparison_.test_);
     
    987956        }
    988957    }
    989 #ifdef CBC_THREAD
    990     if (model->parallelMode() > 0 && model->master()) {
    991       // need to adjust for ones not on tree
    992       CbcBaseModel * master = model->master();
    993       int numberThreads = master->numberThreads();
    994       for (int i=0;i<numberThreads;i++) {
    995         CbcThread * child = master->child(i);
    996         if (child->node()) {
    997           // adjust
    998           double value = child->node()->objectiveValue();
    999           bestPossibleObjective = CoinMin(bestPossibleObjective, value);
    1000         }
    1001       }
    1002     }
    1003 #endif
    1004958    if (lastNode_) {
    1005959        double value = lastNode_->objectiveValue();
     
    13051259        }
    13061260    }
    1307 #ifdef CBC_THREAD
    1308     if (model->parallelMode() > 0 && model->master()) {
    1309       // need to adjust for ones not on tree
    1310       CbcBaseModel * master = model->master();
    1311       int numberThreads = master->numberThreads();
    1312       for (int i=0;i<numberThreads;i++) {
    1313         CbcThread * child = master->child(i);
    1314         if (child->node()) {
    1315           // adjust
    1316           double value = child->node()->objectiveValue();
    1317           bestPossibleObjective = CoinMin(bestPossibleObjective, value);
    1318         }
    1319       }
    1320     }
    1321 #endif
    13221261    /*
    13231262      Rebuild the heap using the retained nodes.
  • releases/2.8.9/Cbc/src/Cbc_ampl.cpp

    r2366 r2366  
    698698int ampl_obj_prec()
    699699{
    700     int precision = obj_prec();
    701     if (precision<=0)
    702         precision=15;
    703     return precision;
     700    return obj_prec();
    704701}
    705702void writeAmpl(ampl_info * info)
     
    13231320    free(rowUpper);
    13241321    free(objective);
    1325     // space for building a row
    1326     char * temp = new char [30*numberColumns_];
    13271322    // do names
    13281323    int iRow;
     
    13821377                                linear = true;
    13831378                            }
     1379                            char temp[1000];
    13841380                            char temp2[30];
    13851381                            if (value == 1.0)
     
    14001396                                    sprintf(temp, "%s%s", expr, temp2);
    14011397                            }
    1402                             assert (static_cast<int>(strlen(temp)) < 30*numberColumns_);
     1398                            assert (strlen(temp) < 1000);
    14031399                            setElement(iRow, j, temp);
    14041400                            if (amplInfo->logLevel > 1)
     
    14261422                                linear = true;
    14271423                            }
     1424                            char temp[1000];
    14281425                            char temp2[30];
    14291426                            if (value == 1.0)
     
    14441441                                    sprintf(temp, "%s%s", expr, temp2);
    14451442                            }
    1446                             assert (static_cast<int>(strlen(temp)) < 30*numberColumns_);
     1443                            assert (strlen(temp) < 1000);
    14471444                            setObjective(j, temp);
    14481445                            if (amplInfo->logLevel > 1)
     
    14581455        }
    14591456    }
    1460     delete [] temp;
    14611457    free(colqp);
    14621458    free(z);
  • releases/2.8.9/Cbc/src/config_cbc_default.h

    r2366 r2366  
    66
    77/* Version number of project */
    8 #define CBC_VERSION "2.8.10"
     8#define CBC_VERSION "2.8.9"
    99
    1010/* Major Version number of project */
     
    1515
    1616/* Release Version number of project */
    17 #define CBC_VERSION_RELEASE 10
     17#define CBC_VERSION_RELEASE 9
  • releases/2.8.9/configure

    r2366 r2366  
    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.8.10.
     4# Generated by GNU Autoconf 2.59 for Cbc 2.8.9.
    55#
    66# Report bugs to <cbc@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Cbc'
    432432PACKAGE_TARNAME='cbc'
    433 PACKAGE_VERSION='2.8.10'
    434 PACKAGE_STRING='Cbc 2.8.10'
     433PACKAGE_VERSION='2.8.9'
     434PACKAGE_STRING='Cbc 2.8.9'
    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.8.10 to adapt to many kinds of systems.
     1041\`configure' configures Cbc 2.8.9 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.8.10:";;
     1107     short | recursive ) echo "Configuration of Cbc 2.8.9:";;
    11081108   esac
    11091109  cat <<\_ACEOF
     
    13281328if $ac_init_version; then
    13291329  cat <<\_ACEOF
    1330 Cbc configure 2.8.10
     1330Cbc configure 2.8.9
    13311331generated by GNU Autoconf 2.59
    13321332
     
    13481348running configure, to aid debugging if configure makes a mistake.
    13491349
    1350 It was created by Cbc $as_me 2.8.10, which was
     1350It was created by Cbc $as_me 2.8.9, which was
    13511351generated by GNU Autoconf 2.59.  Invocation command line was
    13521352
     
    18411841    esac
    18421842  fi
     1843
     1844
     1845 case $build in
     1846  *-mingw*)
     1847    if test "${LD+set}" = set; then :; else
     1848      LD=link
     1849    fi
     1850    ;;
     1851 esac
     1852 if test $enable_msvc = yes ; then
     1853   if test "x${LD+set}" = xset; then :; else
     1854     LD=link
     1855   fi
     1856 fi
     1857
    18431858
    18441859
     
    30633078  clang* ) ;;
    30643079  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3065     LD=link
     3080
     3081 case $build in
     3082  *-mingw*)
     3083    if test "${LD+set}" = set; then :; else
     3084      LD=link
     3085    fi
     3086    ;;
     3087 esac
     3088 if test $enable_msvc = yes ; then
     3089   if test "x${LD+set}" = xset; then :; else
     3090     LD=link
     3091   fi
     3092 fi
     3093
    30663094    ;;
    30673095esac
     
    39413969fi
    39423970
    3943 # correct the LD variable in a build with MS or intel compiler
     3971# correct the LD variable in a mingw build with MS or intel compiler
    39443972case "$CXX" in
    39453973  clang* ) ;;
    39463974  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3947     LD=link
     3975
     3976 case $build in
     3977  *-mingw*)
     3978    if test "${LD+set}" = set; then :; else
     3979      LD=link
     3980    fi
     3981    ;;
     3982 esac
     3983 if test $enable_msvc = yes ; then
     3984   if test "x${LD+set}" = xset; then :; else
     3985     LD=link
     3986   fi
     3987 fi
     3988
    39483989    ;;
    39493990esac
     
    39764017
    39774018
     4019
    39784020ac_ext=f
    39794021ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
     
    41854227
    41864228# Provide some information about the compiler.
    4187 echo "$as_me:4187:" \
     4229echo "$as_me:4229:" \
    41884230     "checking for Fortran 77 compiler version" >&5
    41894231ac_compiler=`set X $ac_compile; echo $2`
     
    46294671case "$F77" in
    46304672  ifort* | */ifort* | IFORT* | */IFORT*)
    4631     LD=link
     4673
     4674 case $build in
     4675  *-mingw*)
     4676    if test "${LD+set}" = set; then :; else
     4677      LD=link
     4678    fi
     4679    ;;
     4680 esac
     4681 if test $enable_msvc = yes ; then
     4682   if test "x${LD+set}" = xset; then :; else
     4683     LD=link
     4684   fi
     4685 fi
     4686
    46324687    ;;
    46334688esac
     
    51145169# Define the identity of the package.
    51155170 PACKAGE='cbc'
    5116  VERSION='2.8.10'
     5171 VERSION='2.8.9'
    51175172
    51185173
     
    64106465*-*-irix6*)
    64116466  # Find out which ABI we are using.
    6412   echo '#line 6412 "configure"' > conftest.$ac_ext
     6467  echo '#line 6467 "configure"' > conftest.$ac_ext
    64136468  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64146469  (eval $ac_compile) 2>&5
     
    83748429   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83758430   -e 's:$: $lt_compiler_flag:'`
    8376    (eval echo "\"\$as_me:8376: $lt_compile\"" >&5)
     8431   (eval echo "\"\$as_me:8431: $lt_compile\"" >&5)
    83778432   (eval "$lt_compile" 2>conftest.err)
    83788433   ac_status=$?
    83798434   cat conftest.err >&5
    8380    echo "$as_me:8380: \$? = $ac_status" >&5
     8435   echo "$as_me:8435: \$? = $ac_status" >&5
    83818436   if (exit $ac_status) && test -s "$ac_outfile"; then
    83828437     # The compiler can only warn and ignore the option if not recognized
     
    86428697   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86438698   -e 's:$: $lt_compiler_flag:'`
    8644    (eval echo "\"\$as_me:8644: $lt_compile\"" >&5)
     8699   (eval echo "\"\$as_me:8699: $lt_compile\"" >&5)
    86458700   (eval "$lt_compile" 2>conftest.err)
    86468701   ac_status=$?
    86478702   cat conftest.err >&5
    8648    echo "$as_me:8648: \$? = $ac_status" >&5
     8703   echo "$as_me:8703: \$? = $ac_status" >&5
    86498704   if (exit $ac_status) && test -s "$ac_outfile"; then
    86508705     # The compiler can only warn and ignore the option if not recognized
     
    87468801   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87478802   -e 's:$: $lt_compiler_flag:'`
    8748    (eval echo "\"\$as_me:8748: $lt_compile\"" >&5)
     8803   (eval echo "\"\$as_me:8803: $lt_compile\"" >&5)
    87498804   (eval "$lt_compile" 2>out/conftest.err)
    87508805   ac_status=$?
    87518806   cat out/conftest.err >&5
    8752    echo "$as_me:8752: \$? = $ac_status" >&5
     8807   echo "$as_me:8807: \$? = $ac_status" >&5
    87538808   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    87548809   then
     
    1109111146  lt_status=$lt_dlunknown
    1109211147  cat > conftest.$ac_ext <<EOF
    11093 #line 11093 "configure"
     11148#line 11148 "configure"
    1109411149#include "confdefs.h"
    1109511150
     
    1119111246  lt_status=$lt_dlunknown
    1119211247  cat > conftest.$ac_ext <<EOF
    11193 #line 11193 "configure"
     11248#line 11248 "configure"
    1119411249#include "confdefs.h"
    1119511250
     
    1353513590   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1353613591   -e 's:$: $lt_compiler_flag:'`
    13537    (eval echo "\"\$as_me:13537: $lt_compile\"" >&5)
     13592   (eval echo "\"\$as_me:13592: $lt_compile\"" >&5)
    1353813593   (eval "$lt_compile" 2>conftest.err)
    1353913594   ac_status=$?
    1354013595   cat conftest.err >&5
    13541    echo "$as_me:13541: \$? = $ac_status" >&5
     13596   echo "$as_me:13596: \$? = $ac_status" >&5
    1354213597   if (exit $ac_status) && test -s "$ac_outfile"; then
    1354313598     # The compiler can only warn and ignore the option if not recognized
     
    1363913694   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1364013695   -e 's:$: $lt_compiler_flag:'`
    13641    (eval echo "\"\$as_me:13641: $lt_compile\"" >&5)
     13696   (eval echo "\"\$as_me:13696: $lt_compile\"" >&5)
    1364213697   (eval "$lt_compile" 2>out/conftest.err)
    1364313698   ac_status=$?
    1364413699   cat out/conftest.err >&5
    13645    echo "$as_me:13645: \$? = $ac_status" >&5
     13700   echo "$as_me:13700: \$? = $ac_status" >&5
    1364613701   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1364713702   then
     
    1520915264   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1521015265   -e 's:$: $lt_compiler_flag:'`
    15211    (eval echo "\"\$as_me:15211: $lt_compile\"" >&5)
     15266   (eval echo "\"\$as_me:15266: $lt_compile\"" >&5)
    1521215267   (eval "$lt_compile" 2>conftest.err)
    1521315268   ac_status=$?
    1521415269   cat conftest.err >&5
    15215    echo "$as_me:15215: \$? = $ac_status" >&5
     15270   echo "$as_me:15270: \$? = $ac_status" >&5
    1521615271   if (exit $ac_status) && test -s "$ac_outfile"; then
    1521715272     # The compiler can only warn and ignore the option if not recognized
     
    1531315368   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1531415369   -e 's:$: $lt_compiler_flag:'`
    15315    (eval echo "\"\$as_me:15315: $lt_compile\"" >&5)
     15370   (eval echo "\"\$as_me:15370: $lt_compile\"" >&5)
    1531615371   (eval "$lt_compile" 2>out/conftest.err)
    1531715372   ac_status=$?
    1531815373   cat out/conftest.err >&5
    15319    echo "$as_me:15319: \$? = $ac_status" >&5
     15374   echo "$as_me:15374: \$? = $ac_status" >&5
    1532015375   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1532115376   then
     
    1752017575   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1752117576   -e 's:$: $lt_compiler_flag:'`
    17522    (eval echo "\"\$as_me:17522: $lt_compile\"" >&5)
     17577   (eval echo "\"\$as_me:17577: $lt_compile\"" >&5)
    1752317578   (eval "$lt_compile" 2>conftest.err)
    1752417579   ac_status=$?
    1752517580   cat conftest.err >&5
    17526    echo "$as_me:17526: \$? = $ac_status" >&5
     17581   echo "$as_me:17581: \$? = $ac_status" >&5
    1752717582   if (exit $ac_status) && test -s "$ac_outfile"; then
    1752817583     # The compiler can only warn and ignore the option if not recognized
     
    1778817843   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1778917844   -e 's:$: $lt_compiler_flag:'`
    17790    (eval echo "\"\$as_me:17790: $lt_compile\"" >&5)
     17845   (eval echo "\"\$as_me:17845: $lt_compile\"" >&5)
    1779117846   (eval "$lt_compile" 2>conftest.err)
    1779217847   ac_status=$?
    1779317848   cat conftest.err >&5
    17794    echo "$as_me:17794: \$? = $ac_status" >&5
     17849   echo "$as_me:17849: \$? = $ac_status" >&5
    1779517850   if (exit $ac_status) && test -s "$ac_outfile"; then
    1779617851     # The compiler can only warn and ignore the option if not recognized
     
    1789217947   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1789317948   -e 's:$: $lt_compiler_flag:'`
    17894    (eval echo "\"\$as_me:17894: $lt_compile\"" >&5)
     17949   (eval echo "\"\$as_me:17949: $lt_compile\"" >&5)
    1789517950   (eval "$lt_compile" 2>out/conftest.err)
    1789617951   ac_status=$?
    1789717952   cat out/conftest.err >&5
    17898    echo "$as_me:17898: \$? = $ac_status" >&5
     17953   echo "$as_me:17953: \$? = $ac_status" >&5
    1789917954   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1790017955   then
     
    2343323488cat >&5 <<_CSEOF
    2343423489
    23435 This file was extended by Cbc $as_me 2.8.10, which was
     23490This file was extended by Cbc $as_me 2.8.9, which was
    2343623491generated by GNU Autoconf 2.59.  Invocation command line was
    2343723492
     
    2349123546cat >>$CONFIG_STATUS <<_ACEOF
    2349223547ac_cs_version="\\
    23493 Cbc config.status 2.8.10
     23548Cbc config.status 2.8.9
    2349423549configured by $0, generated by GNU Autoconf 2.59,
    2349523550  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/2.8.9/configure.ac

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