Changeset 1684 for stable


Ignore:
Timestamp:
Jul 2, 2011 10:07:44 AM (8 years ago)
Author:
stefan
Message:

sync with trunk rev1683

Location:
stable/2.7
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/2.7/Cbc

  • stable/2.7/Cbc/configure

    r1675 r1684  
    2094920949if test -n "$PKG_CONFIG" ; then
    2095020950  if $PKG_CONFIG --exists "cgl osi coinutils"; then
    20951     COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion "cgl osi coinutils" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     20951    COINDEPEND_VERSIONS=`$PKG_CONFIG --modversion "cgl osi coinutils" 2>/dev/null | tr '\n' ' '`
    2095220952     cflags=`$PKG_CONFIG --cflags "cgl osi coinutils" 2>/dev/null`
    2095320953    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2149821498if test -n "$PKG_CONFIG" ; then
    2149921499  if $PKG_CONFIG --exists "osi-clp"; then
    21500     CLP_VERSIONS="`$PKG_CONFIG --modversion "osi-clp" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     21500    CLP_VERSIONS=`$PKG_CONFIG --modversion "osi-clp" 2>/dev/null | tr '\n' ' '`
    2150121501     cflags=`$PKG_CONFIG --cflags "osi-clp" 2>/dev/null`
    2150221502    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2202522025if test -n "$PKG_CONFIG" ; then
    2202622026  if $PKG_CONFIG --exists "osi-unittests"; then
    22027     OSITESTS_VERSIONS="`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     22027    OSITESTS_VERSIONS=`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null | tr '\n' ' '`
    2202822028     cflags=`$PKG_CONFIG --cflags "osi-unittests" 2>/dev/null`
    2202922029    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2250622506if test -n "$PKG_CONFIG" ; then
    2250722507  if $PKG_CONFIG --exists "coindatasample"; then
    22508     SAMPLE_VERSIONS="`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     22508    SAMPLE_VERSIONS=`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null | tr '\n' ' '`
    2250922509     cflags=`$PKG_CONFIG --cflags "coindatasample" 2>/dev/null`
    2251022510    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2298722987if test -n "$PKG_CONFIG" ; then
    2298822988  if $PKG_CONFIG --exists "coindatanetlib"; then
    22989     NETLIB_VERSIONS="`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     22989    NETLIB_VERSIONS=`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null | tr '\n' ' '`
    2299022990     cflags=`$PKG_CONFIG --cflags "coindatanetlib" 2>/dev/null`
    2299122991    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2346823468if test -n "$PKG_CONFIG" ; then
    2346923469  if $PKG_CONFIG --exists "coindatamiplib3"; then
    23470     MIPLIB3_VERSIONS="`$PKG_CONFIG --modversion "coindatamiplib3" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     23470    MIPLIB3_VERSIONS=`$PKG_CONFIG --modversion "coindatamiplib3" 2>/dev/null | tr '\n' ' '`
    2347123471     cflags=`$PKG_CONFIG --cflags "coindatamiplib3" 2>/dev/null`
    2347223472    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2495824958if test -n "$PKG_CONFIG" ; then
    2495924959  if $PKG_CONFIG --exists "osi-dylp"; then
    24960     DYLP_VERSIONS="`$PKG_CONFIG --modversion "osi-dylp" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     24960    DYLP_VERSIONS=`$PKG_CONFIG --modversion "osi-dylp" 2>/dev/null | tr '\n' ' '`
    2496124961     cflags=`$PKG_CONFIG --cflags "osi-dylp" 2>/dev/null`
    2496224962    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2545825458if test -n "$PKG_CONFIG" ; then
    2545925459  if $PKG_CONFIG --exists "osi-vol"; then
    25460     VOL_VERSIONS="`$PKG_CONFIG --modversion "osi-vol" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     25460    VOL_VERSIONS=`$PKG_CONFIG --modversion "osi-vol" 2>/dev/null | tr '\n' ' '`
    2546125461     cflags=`$PKG_CONFIG --cflags "osi-vol" 2>/dev/null`
    2546225462    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2596125961if test -n "$PKG_CONFIG" ; then
    2596225962  if $PKG_CONFIG --exists "osi-cplex"; then
    25963     CPX_VERSIONS="`$PKG_CONFIG --modversion "osi-cplex" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     25963    CPX_VERSIONS=`$PKG_CONFIG --modversion "osi-cplex" 2>/dev/null | tr '\n' ' '`
    2596425964     cflags=`$PKG_CONFIG --cflags "osi-cplex" 2>/dev/null`
    2596525965    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2649126491if test -n "$PKG_CONFIG" ; then
    2649226492  if $PKG_CONFIG --exists "osi-glpk"; then
    26493     GLPK_VERSIONS="`$PKG_CONFIG --modversion "osi-glpk" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     26493    GLPK_VERSIONS=`$PKG_CONFIG --modversion "osi-glpk" 2>/dev/null | tr '\n' ' '`
    2649426494     cflags=`$PKG_CONFIG --cflags "osi-glpk" 2>/dev/null`
    2649526495    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2699126991if test -n "$PKG_CONFIG" ; then
    2699226992  if $PKG_CONFIG --exists "osi-gurobi"; then
    26993     GRB_VERSIONS="`$PKG_CONFIG --modversion "osi-gurobi" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     26993    GRB_VERSIONS=`$PKG_CONFIG --modversion "osi-gurobi" 2>/dev/null | tr '\n' ' '`
    2699426994     cflags=`$PKG_CONFIG --cflags "osi-gurobi" 2>/dev/null`
    2699526995    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2748327483if test -n "$PKG_CONFIG" ; then
    2748427484  if $PKG_CONFIG --exists "osi-mosek"; then
    27485     MSK_VERSIONS="`$PKG_CONFIG --modversion "osi-mosek" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     27485    MSK_VERSIONS=`$PKG_CONFIG --modversion "osi-mosek" 2>/dev/null | tr '\n' ' '`
    2748627486     cflags=`$PKG_CONFIG --cflags "osi-mosek" 2>/dev/null`
    2748727487    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2799427994if test -n "$PKG_CONFIG" ; then
    2799527995  if $PKG_CONFIG --exists "osi-soplex"; then
    27996     SPX_VERSIONS="`$PKG_CONFIG --modversion "osi-soplex" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     27996    SPX_VERSIONS=`$PKG_CONFIG --modversion "osi-soplex" 2>/dev/null | tr '\n' ' '`
    2799727997     cflags=`$PKG_CONFIG --cflags "osi-soplex" 2>/dev/null`
    2799827998    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2849428494if test -n "$PKG_CONFIG" ; then
    2849528495  if $PKG_CONFIG --exists "osi-xpress"; then
    28496     XPR_VERSIONS="`$PKG_CONFIG --modversion "osi-xpress" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     28496    XPR_VERSIONS=`$PKG_CONFIG --modversion "osi-xpress" 2>/dev/null | tr '\n' ' '`
    2849728497     cflags=`$PKG_CONFIG --cflags "osi-xpress" 2>/dev/null`
    2849828498    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2898128981if test -n "$PKG_CONFIG" ; then
    2898228982  if $PKG_CONFIG --exists "coinasl"; then
    28983     ASL_VERSIONS="`$PKG_CONFIG --modversion "coinasl" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     28983    ASL_VERSIONS=`$PKG_CONFIG --modversion "coinasl" 2>/dev/null | tr '\n' ' '`
    2898428984     cflags=`$PKG_CONFIG --cflags "coinasl" 2>/dev/null`
    2898528985    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    3012330123
    3012430124  fi
    30125 
    30126   # On AIX, the default sed cannot deal with somewhat long sed commands executed by config.status.
    30127   # So we reduce the hardcoded number of commands given to sed from 48 to 5 in config.status, hoping this will suffice.
    30128 
    3012930125
    3013030126  cat >confcache <<\_ACEOF
     
    3209632092
    3209732093
    32098     case $build in
    32099       *-aix*)
    32100         { echo "$as_me:$LINENO: patching config.status to reduce ac_max_sed_lines to 5" >&5
    32101 echo "$as_me: patching config.status to reduce ac_max_sed_lines to 5" >&6;}
    32102         sed -e 's/ac_max_sed_lines=48/ac_max_sed_lines=5/g' config.status > config.status.tmp
    32103         mv config.status.tmp config.status
    32104       ;;
    32105     esac
    32106 
    32107 
    3210832094# configure is writing to config.log, and then calls config.status.
    3210932095# config.status does its own redirection, appending to config.log.
  • stable/2.7/Cbc/src/CbcModel.cpp

    r1681 r1684  
    23972397        doHeuristicsAtRoot();
    23982398    if (solverCharacteristics_->solutionAddsCuts()) {
    2399       // With some heuristics solver needs a resolve here (don't know if this is bug in heuristics)
     2399      // With some heuristics solver needs a resolve here
    24002400      solver_->resolve();
    24012401      if(!isProvenOptimal()){
     
    24142414    stoppedOnGap_ = false ;
    24152415    // See if can stop on gap
    2416     if (solverCharacteristics_->solutionAddsCuts()) {
    2417       // With some heuristics solver needs a resolve here (don't know if this is bug in heuristics)
    2418       solver_->resolve();
    2419       if(!isProvenOptimal()){
    2420         solver_->initialSolve();
    2421       }
    2422     }
    24232416    bestPossibleObjective_ = solver_->getObjValue() * solver_->getObjSense();
    24242417    double testGap = CoinMax(dblParam_[CbcAllowableGap],
     
    25942587    }
    25952588    currentNumberCuts_ = numberNewCuts_ ;
     2589    if (solverCharacteristics_->solutionAddsCuts()) {
     2590      // With some heuristics solver needs a resolve here (don't know if this is bug in heuristics)
     2591      solver_->resolve();
     2592      if(!isProvenOptimal()){
     2593        solver_->initialSolve();
     2594      }
     2595    }
    25962596    // See if can stop on gap
    25972597    bestPossibleObjective_ = solver_->getObjValue() * solver_->getObjSense();
     
    71087108        }
    71097109        //Is Necessary for Bonmin? Always keepGoing if cuts have been generated in last iteration (taken from similar code in Cbc-2.4)
    7110         if (solverCharacteristics_->solutionAddsCuts()&&numberViolated) {
    7111           for (i = 0;i<numberCutGenerators_;i++) {
    7112             if (generator_[i]->mustCallAgain()) {
    7113               keepGoing=true; // say must go round
    7114               break;
    7115             }
    7116           }
    7117         }
     7110        if (solverCharacteristics_->solutionAddsCuts()&&numberViolated) {
     7111          for (i = 0;i<numberCutGenerators_;i++) {
     7112            if (generator_[i]->mustCallAgain()) {
     7113              keepGoing=true; // say must go round
     7114              break;
     7115            }
     7116          }
     7117        }
    71187118        if(!keepGoing){
    7119           // Status for single pass of cut generation
    7120           int status = 0;
    7121           /*
    7122             threadMode with bit 2^1 set indicates we should use threads for root cut
    7123             generation.
    7124           */
    7125           if ((threadMode_&2) == 0 || numberNodes_) {
     7119        // Status for single pass of cut generation
     7120        int status = 0;
     7121        /*
     7122          threadMode with bit 2^1 set indicates we should use threads for root cut
     7123          generation.
     7124        */
     7125        if ((threadMode_&2) == 0 || numberNodes_) {
    71267126            status = serialCuts(theseCuts, node, slackCuts, lastNumberCuts);
    7127           } else {
     7127        } else {
    71287128            // do cuts independently
    71297129#ifdef CBC_THREAD
    71307130            status = parallelCuts(master, theseCuts, node, slackCuts, lastNumberCuts);
    71317131#endif
    7132           }
    7133           // Do we need feasible and violated?
    7134           feasible = (status >= 0);
    7135           if (status == 1)
     7132        }
     7133        // Do we need feasible and violated?
     7134        feasible = (status >= 0);
     7135        if (status == 1)
    71367136            keepGoing = true;
    7137           else if (status == 2)
     7137        else if (status == 2)
    71387138            numberTries = 0;
    7139           if (!feasible)
     7139        if (!feasible)
    71407140            violated = -2;
    71417141        }
     
    1259412594#endif
    1259512595    currentNode_ = newNode; // so can be used elsewhere
     12596// Remember number of rows to restore at the end of the loop
     12597    int saveNumberRows=solver_->getNumRows();
    1259612598    /*
    1259712599      Enough preparation. Get down to the business of choosing a branching
    1259812600      variable.
    1259912601    */
    12600     int saveNumberRows=solver_->getNumRows();
    1260112602    while (anyAction == -1) {
    1260212603        // Set objective value (not so obvious if NLP etc)
     
    1274512746        }
    1274612747    }
     12748    //A candidate has been found; restore the subproblem.
    1274712749    if( saveNumberRows<solver_->getNumRows()) {
    1274812750        // delete rows - but leave solution
  • stable/2.7/configure

    r1675 r1684  
    2313523135  fi
    2313623136
    23137   # On AIX, the default sed cannot deal with somewhat long sed commands executed by config.status.
    23138   # So we reduce the hardcoded number of commands given to sed from 48 to 5 in config.status, hoping this will suffice.
    23139 
    23140 
    2314123137  cat >confcache <<\_ACEOF
    2314223138# This file is a shell script that caches the results of configure
     
    2440124397
    2440224398
    24403     case $build in
    24404       *-aix*)
    24405         { echo "$as_me:$LINENO: patching config.status to reduce ac_max_sed_lines to 5" >&5
    24406 echo "$as_me: patching config.status to reduce ac_max_sed_lines to 5" >&6;}
    24407         sed -e 's/ac_max_sed_lines=48/ac_max_sed_lines=5/g' config.status > config.status.tmp
    24408         mv config.status.tmp config.status
    24409       ;;
    24410     esac
    24411 
    24412 
    2441324399# configure is writing to config.log, and then calls config.status.
    2441424400# config.status does its own redirection, appending to config.log.
Note: See TracChangeset for help on using the changeset viewer.