Changeset 2439


Ignore:
Timestamp:
Mar 27, 2019 10:10:04 PM (8 months ago)
Author:
stefan
Message:

merge r2435,r2437,r2438 from stable/1.17 to trunk

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Clp

  • trunk/Clp/src

  • trunk/Clp/src/ClpEventHandler.cpp

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

    r2393 r2439  
    153153  primalColumnPivot_ = new ClpPrimalColumnSteepest();
    154154  solveType_ = 1; // say simplex based life form
     155  eventHandler_->setSimplex(this);
    155156}
    156157
     
    266267  primalColumnPivot_ = new ClpPrimalColumnSteepest();
    267268  solveType_ = 1; // say simplex based life form
     269  eventHandler_->setSimplex(this);
    268270  if (fixOthers) {
    269271    int numberOtherColumns = rhs->numberColumns();
     
    412414  }
    413415  saveStatus_ = NULL;
     416  eventHandler_->setSimplex(this);
    414417  factorization_ = new ClpFactorization(*rhs->factorization_, -numberRows_);
    415418  //factorization_ = new ClpFactorization(*rhs->factorization_,
     
    62696272  ClpInterior barrier;
    62706273  barrier.borrowModel(*model2);
     6274  barrier.eventHandler()->setSimplex(NULL);
    62716275  // See if quadratic objective
    62726276  ClpQuadraticObjective *quadraticObj = NULL;
     
    73947398      << CoinMessageEol;
    73957399    problemStatus_ = 1;
     7400    // but set secondary status to avoid errors
     7401    secondaryStatus_ = 6; // good enough
    73967402    return false;
    73977403  }
  • trunk/Clp/src/ClpSimplexNonlinear.cpp

    r2385 r2439  
    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) {
  • trunk/Clp/src/ClpSolve.cpp

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

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

    r2428 r2439  
    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.