Changeset 1843


Ignore:
Timestamp:
Feb 16, 2012 10:16:53 AM (8 years ago)
Author:
stefan
Message:

merge chgset 1842 from stable/1.14

Location:
trunk/Clp/src/OsiClp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/OsiClp

  • trunk/Clp/src/OsiClp/OsiClpSolverInterface.cpp

    r1828 r1843  
    23742374    unsigned char * saveStatus = reinterpret_cast<unsigned char *> (arrayI+1);
    23752375    CoinMemcpyN(saveStatus,number,smallModel_->statusArray());
    2376     smallModel_->setFactorization(*factorization_);
     2376    /* If factorization_ NULL then infeasible
     2377       not really sure how could have slipped through.
     2378       But this can't make situation worse */
     2379    if (factorization_)
     2380      smallModel_->setFactorization(*factorization_);
    23772381    //int * backColumn = whichColumn+numberColumns;
    23782382    const double * lowerBig = modelPtr_->columnLower();
     
    24132417        break;
    24142418    }
    2415     bool infeasible = (i<numberColumns2);
     2419    /* If factorization_ NULL then infeasible
     2420       not really sure how could have slipped through.
     2421       But this can't make situation worse */
     2422    bool infeasible = (i<numberColumns2||!factorization_);
    24162423    // Start of fast iterations
    24172424    bool alwaysFinish= ((specialOptions_&32)==0) ? true : false;
Note: See TracChangeset for help on using the changeset viewer.