Changeset 2080


Ignore:
Timestamp:
Jan 6, 2015 7:38:56 AM (5 years ago)
Author:
forrest
Message:

try and take out null message and extra solve

Location:
trunk/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpSimplexPrimal.cpp

    r2078 r2080  
    10261026                    numberThrownOut = gutsOfSolution(NULL, NULL, (firstFree_ >= 0));
    10271027                    //assert (!numberThrownOut);
     1028#ifdef CLP_USEFUL_PRINTOUT
    10281029                    if (numberThrownOut)
    10291030                      printf("OUCH! - %d thrownout at %s line %d\n",
    10301031                             numberThrownOut,__FILE__,__LINE__);
    1031                       //abort();
    1032                     //if (numberThrownOut)
    1033                     //printf("OUCH! - %d thrownout at %s line %d\n",
    1034                     //       numberThrownOut,__FILE__,__LINE__);
     1032#endif
    10351033                    sumInfeasibility =  nonLinearCost_->sumInfeasibilities();
    10361034               }
     
    13201318          }
    13211319     }
     1320     bool looksOptimal = (!numberDualInfeasibilities_&&!nonLinearCost_->sumInfeasibilities());
    13221321     // had ||(type==3&&problemStatus_!=-5) -- ??? why ????
    1323      if ((dualFeasible() || problemStatus_ == -4) && !ifValuesPass) {
     1322     if ((dualFeasible() || problemStatus_ == -4) && (!ifValuesPass||looksOptimal)) {
    13241323          // see if extra helps
    13251324          if (nonLinearCost_->numberInfeasibilities() &&
     
    27922791          }
    27932792     }
    2794      handler_->message(CLP_SIMPLEX_PERTURB, messages_)
     2793     if (largest || largestZero) {
     2794       handler_->message(CLP_SIMPLEX_PERTURB, messages_)
    27952795               << 100.0 * maximumFraction << perturbation << largest << 100.0 * largestPerCent << largestZero
    27962796               << CoinMessageEol;
    2797      // say perturbed
    2798      perturbation_ = 101;
     2797       // say perturbed
     2798       perturbation_ = 101;
     2799     } else {
     2800       // say no need
     2801       perturbation_ = 102;
     2802     }
    27992803}
    28002804// un perturb
  • trunk/Clp/src/ClpSolve.cpp

    r2078 r2080  
    623623        abcModel2->setStateOfProblem(abcModel2->stateOfProblem() | VALUES_PASS);
    624624        Idiot info(*abcModel2);
    625         info.setStrategy(idiotOptions | info.getStrategy());
    626625        info.setStrategy(512 | info.getStrategy());
    627626        // Allow for scaling
Note: See TracChangeset for help on using the changeset viewer.