Changeset 2438


Ignore:
Timestamp:
Mar 26, 2019 8:39:54 AM (2 months ago)
Author:
forrest
Message:

try and fix event handler

Location:
stable/1.17/Clp/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/1.17/Clp/src/ClpEventHandler.cpp

    r2385 r2438  
    5656int ClpEventHandler::event(Event whichEvent)
    5757{
     58
     59  assert (!model_||model_->eventHandler()==this);
    5860  if (whichEvent != theta)
    5961    return -1; // do nothing
  • stable/1.17/Clp/src/ClpSimplexNonlinear.cpp

    r2385 r2438  
    20992099      //objTheta=-1.0; // so we fall through
    21002100    }
    2101     assert(theta_ < 1.0e30); // for now
     2101    if (theta_ >= 1.0e30) // odd
     2102      ordinaryDj=true;
    21022103    // See if we need to pivot
    21032104    if (theta_ == basicTheta || ordinaryDj) {
  • stable/1.17/Clp/src/ClpSolve.cpp

    r2385 r2438  
    31173117    ClpInterior barrier(*model2);
    31183118#endif
     3119    barrier.eventHandler()->setSimplex(NULL);
    31193120    if (interrupt)
    31203121      currentModel2 = &barrier;
  • stable/1.17/Clp/src/OsiClp/OsiClpSolverInterface.cpp

    r2431 r2438  
    117117    deleteSolver = true;
    118118    solver->borrowModel(*modelPtr_);
     119    solver->eventHandler()->setSimplex(solver);
    119120    // See if user set factorization frequency
    120121    // borrowModel does not move
Note: See TracChangeset for help on using the changeset viewer.