Changeset 2237


Ignore:
Timestamp:
Jan 3, 2017 10:53:33 AM (18 months ago)
Author:
forrest
Message:

stability and allowing cbc option

Location:
stable/1.16/Clp/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.16/Clp/src/CbcOrClpParam.cpp

    r2228 r2237  
    384838487 - 128 Try and create cliques\n 8 - 256 If all +1 try hard for dominated rows\n \
    3849384910 - 1024 Use a larger feasibility tolerance in presolve\n \
    3850 11 - 2048 Try probing before creating cliques"
     385011 - 2048 Try probing before creating cliques\n \
     385112 - 4096 Switch off duplicate column checking for integers"
    38513852     );
    38523853     parameters[numberParameters++] =
  • stable/1.16/Clp/src/ClpSimplex.cpp

    r2154 r2237  
    56385638               if (intParam_[ClpMaxNumIteration] > 100000 + numberIterations_)
    56395639                    intParam_[ClpMaxNumIteration]
    5640                     = numberIterations_ + 1000 + 2 * numberRows_ + numberColumns_;
     5640                    = numberIterations_ + 5000 + 2 * numberRows_ + numberColumns_;
    56415641          } else {
    56425642               // Not normal allow more
    5643                baseIteration_ += 2 * (numberRows_ + numberColumns_);
     5643               baseIteration_ += 5000 + 2 * (numberRows_ + numberColumns_);
    56445644          }
    56455645          // check which algorithms allowed
  • stable/1.16/Clp/src/ClpSimplexPrimal.cpp

    r2232 r2237  
    12821282     if (sumOfRelaxedDualInfeasibilities_ == 0.0 &&
    12831283               sumOfRelaxedPrimalInfeasibilities_ == 0.0 &&
    1284          progress->objective_[CLP_PROGRESS-1]>
     1284         progress->objective_[CLP_PROGRESS-1]>=
    12851285         progress->objective_[CLP_PROGRESS-2]-1.0e-9*(10.0+fabs(objectiveValue_))) {
    12861286          // say optimal (with these bounds etc)
     
    13271327     bool looksOptimal = (!numberDualInfeasibilities_&&!nonLinearCost_->sumInfeasibilities());
    13281328     // had ||(type==3&&problemStatus_!=-5) -- ??? why ????
    1329      if ((dualFeasible() || problemStatus_ == -4) && (!ifValuesPass||looksOptimal)) {
     1329     if ((dualFeasible() || problemStatus_ == -4) && (!ifValuesPass||looksOptimal||firstFree_<0)) {
    13301330          // see if extra helps
    13311331          if (nonLinearCost_->numberInfeasibilities() &&
    13321332                    (nonLinearCost_->sumInfeasibilities() > 1.0e-3 || sumOfRelaxedPrimalInfeasibilities_)
    1333                     && !alwaysOptimal) {
     1333              /*&& alwaysOptimal*/) {
    13341334               //may need infeasiblity cost changed
    13351335               // we can see if we can construct a ray
     
    13611361                    for (i = 0; i < numberRows_ + numberColumns_; i++)
    13621362                         cost_[i] *= 1.0e-95;
    1363                     gutsOfSolution(NULL, NULL, ifValuesPass != 0);
     1363                    gutsOfSolution(NULL, NULL, ifValuesPass != 0 && firstFree_>=0);
    13641364                    nonLinearCost_ = nonLinear;
    13651365                    infeasibilityCost_ = saveWeight;
     
    15081508                    }
    15091509               } else {
    1510                     if (!alwaysOptimal || !sumOfRelaxedPrimalInfeasibilities_)
     1510                    if (alwaysOptimal || !sumOfRelaxedPrimalInfeasibilities_)
    15111511                         problemStatus_ = 0; // optimal
    15121512                    else
Note: See TracChangeset for help on using the changeset viewer.