Changeset 1341 for trunk/Clp


Ignore:
Timestamp:
Feb 25, 2009 1:34:16 PM (11 years ago)
Author:
forrest
Message:

change assert to return -1 in pivot

File:
1 edited

Legend:

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

    r1332 r1341  
    79797979      }
    79807980    }
    7981     assert (fabs(alpha_)>1.0e-12);
     7981    if (fabs(alpha_)<1.0e-8)
     7982      return -1; // will be singular
    79827983    // we are going to subtract movement from current basic
    79837984    double movement;
     
    80338034    // update duals
    80348035    if (pivotRow_>=0) {
    8035       assert (fabs(alpha_)>1.0e-8);
     8036      if (fabs(alpha_)<1.0e-8)
     8037        return -1; // will be singular
    80368038      double multiplier = dualIn_/alpha_;
    80378039      rowArray_[0]->insert(pivotRow_,multiplier);
     
    80838085        lastGoodIteration_==numberIterations_&&fabs(alpha_)>1.0e-5)
    80848086      updateStatus=4;
    8085     if (updateStatus==1||updateStatus==4) {
     8087    if (updateStatus==1||updateStatus==4||fabs(alpha_)<1.0e-6) {
    80868088      // slight error
    80878089      if (factorization_->pivots()>5||updateStatus==4) {
Note: See TracChangeset for help on using the changeset viewer.