Changeset 468 for trunk/ClpSimplex.cpp


Ignore:
Timestamp:
Oct 7, 2004 2:13:58 PM (15 years ago)
Author:
forrest
Message:

to make sbb faster

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpSimplex.cpp

    r460 r468  
    22492249    }
    22502250  }
     2251  bool doSanityCheck=true;
    22512252  if ((what&(16+32))!=0) {
     2253    // We may want to switch stuff off for speed
     2254    if ((specialOptions_&256)!=0)
     2255      makeRowCopy=false; // no row copy
     2256    if ((specialOptions_&128)!=0)
     2257      doSanityCheck=false; // no sanity check
    22522258    // move information to work arrays
    22532259    double direction = optimizationDirection_;
     
    23112317    if (!matrix_)
    23122318      matrix_=new ClpPackedMatrix();
    2313     if (!matrix_->allElementsInRange(this,smallElement_,1.0e20)) {
     2319    int checkType=(doSanityCheck) ? 15 : 14;
     2320    if (!matrix_->allElementsInRange(this,smallElement_,1.0e20,checkType)) {
    23142321      problemStatus_=4;
    23152322      goodMatrix= false;
     
    25402547  }
    25412548 
    2542   if ((what&16)!=0) {
     2549  if ((what&16)!=0&&doSanityCheck) {
    25432550    // check rim of problem okay
    25442551    if (!sanityCheck())
     
    55035510  saved.pivotTolerance_ = factorization_->pivotTolerance();
    55045511  saved.perturbation_ = perturbation_;
     5512  saved.forceFactorization_=forceFactorization_;
    55055513  // Progress indicator
    55065514  delete progress_;
     
    55175525  infeasibilityCost_ = saved.infeasibilityCost_;
    55185526  dualBound_ = saved.dualBound_;
     5527  forceFactorization_=saved.forceFactorization_;
    55195528  delete progress_;
    55205529  progress_=NULL;
Note: See TracChangeset for help on using the changeset viewer.