Changeset 2333


Ignore:
Timestamp:
Sep 3, 2018 9:07:53 AM (16 months ago)
Author:
forrest
Message:

minor change to Idiot

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r2332 r2333  
    20592059                              info.setStartingWeight(1.0e-1);
    20602060                              info.setReduceIterations(6);
    2061                               if (!largestGap)
     2061                              if (!largestGap && nPasses <= 50)
    20622062                                   nPasses *= 2;
    20632063                              //info.setFeasibilityTolerance(1.0e-7);
  • trunk/Clp/src/Idiot.cpp

    r2324 r2333  
    103103          const CoinPackedMatrix * matrix = model_->getMatrixByCol();
    104104#else
    105           ClpMatrixBase * matrix = model_->clpMatrix();
     105          // safer for odd matrices
     106          const CoinPackedMatrix * matrix = model_->matrix();
     107          //ClpMatrixBase * matrix = model_->clpMatrix();
    106108#endif
    107109          const int * row = matrix->getIndices();
     
    293295     const CoinPackedMatrix * matrix = model->getMatrixByCol();
    294296#else
    295      ClpMatrixBase * matrix = model->clpMatrix();
     297     // safer for odd matrices (note really ClpSimplex not OsiSolverInterface)
     298     const CoinPackedMatrix * matrix = model->matrix();
     299     //ClpMatrixBase * matrix = model_->clpMatrix();
    296300#endif
    297301     const int * row = matrix->getIndices();
     
    445449     const CoinPackedMatrix * matrix = model_->getMatrixByCol();
    446450#else
    447      ClpMatrixBase * matrix = model_->clpMatrix();
     451     // safer for odd matrices
     452     const CoinPackedMatrix * matrix = model_->matrix();
     453     //ClpMatrixBase * matrix = model_->clpMatrix();
    448454#endif
    449455     const int * row = matrix->getIndices();
     
    13271333     colsol = model_->primalColumnSolution();;
    13281334     double * cost = model_->objective();
    1329 
    13301335     int slackEnd, ordStart, ordEnd;
    13311336     int slackStart = countCostedSlacks(model_);
     
    19421947                         }
    19431948                    }
     1949
    19441950                    double averageInfeasibility=sum/nrows;
    19451951                    sprintf(line,"sum of infeasibilities %g - average %g, %d fixed columns",
Note: See TracChangeset for help on using the changeset viewer.