Ignore:
Timestamp:
Apr 7, 2019 11:34:28 PM (3 months ago)
Author:
stefan
Message:

sync with trunk

Location:
stable/1.17/Clp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.17/Clp

  • stable/1.17/Clp/src

  • stable/1.17/Clp/src/ClpSimplexNonlinear.cpp

    r2438 r2449  
    20992099      //objTheta=-1.0; // so we fall through
    21002100    }
    2101     if (theta_ >= 1.0e30) // odd
    2102       ordinaryDj=true;
     2101    if (theta_ >= 1.0e30) { // odd
     2102      returnCode=2;
     2103      break;
     2104    }
    21032105    // See if we need to pivot
    21042106    if (theta_ == basicTheta || ordinaryDj) {
     
    23082310      longArray->clear();
    23092311      if (ordinaryDj) {
     2312        assert (sequenceIn_>=0);
    23102313        valueIn_ = solution_[sequenceIn_];
    23112314        dualIn_ = dj_[sequenceIn_];
Note: See TracChangeset for help on using the changeset viewer.