Changeset 2588


Ignore:
Timestamp:
Jun 13, 2019 10:38:38 AM (2 years ago)
Author:
stefan
Message:

merge r2574,r2582 from trunk

Location:
stable/2.10
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • stable/2.10

  • stable/2.10/Cbc

  • stable/2.10/Cbc/src

  • stable/2.10/Cbc/src/CbcModel.cpp

    r2567 r2588  
    54465446  solverCharacteristics_->setSolver(solver_);
    54475447  solver_->setHintParam(OsiDoInBranchAndCut, true, OsiHintDo, NULL);
     5448  // doesn't seem to be uniform time limit
     5449#ifdef COIN_HAS_CLP
     5450  OsiClpSolverInterface *clpSolver
     5451    = dynamic_cast< OsiClpSolverInterface * >(solver_);
     5452  if (clpSolver) {
     5453    double maxTime = dblParam_[CbcMaximumSeconds]-dblParam_[CbcStartSeconds];
     5454    if ((moreSpecialOptions_&131072)==0)
     5455      clpSolver->getModelPtr()->setMaximumSeconds(maxTime);
     5456    else
     5457      clpSolver->getModelPtr()->setMaximumWallSeconds(maxTime);
     5458  }
     5459#endif
    54485460  solver_->initialSolve();
    54495461  solver_->setHintParam(OsiDoInBranchAndCut, false, OsiHintDo, NULL);
  • stable/2.10/Cbc/src/CbcSolver.cpp

    r2550 r2588  
    78077807                  delete basis;
    78087808                  originalSolver->setDblParam(OsiDualObjectiveLimit, COIN_DBL_MAX);
     7809                  originalSolver->setHintParam(OsiDoPresolveInResolve, true, OsiHintTry);
    78097810                  originalSolver->resolve();
    78107811                  if (!originalSolver->isProvenOptimal()) {
  • stable/2.10/Cbc/src/Cbc_C_Interface.cpp

    r2567 r2588  
    12671267Cbc_clone(Cbc_Model *model)
    12681268{
    1269 
    12701269  const char prefix[] = "Cbc_C_Interface::Cbc_clone(): ";
    12711270  //  const int  VERBOSE = 1;
     
    12771276  result->model_ = new CbcModel(*(model->model_));
    12781277  result->solver_ = dynamic_cast< OsiClpSolverInterface * >(result->model_->solver());
     1278  result->cbcData = new CbcSolverUsefulData();
    12791279  result->handler_ = NULL;
    12801280  result->cmdargs_ = model->cmdargs_;
    12811281  result->relax_ = model->relax_;
     1282  result->cbcData->noPrinting_ = model->cbcData->noPrinting_;
     1283  result->inc_callback = model->inc_callback;
     1284  if (model->colNameIndex)
     1285    Cbc_storeNameIndexes(result, 1);
     1286
     1287  result->colSpace = 0;
     1288  result->nCols = 0;
     1289  result->cNameSpace = 0;
     1290  result->cNameStart = NULL;
     1291  result->cInt = NULL;
     1292  result->cNames= NULL;
     1293  result->cLB = NULL;
     1294  result->cUB = NULL;
     1295  result->cObj = NULL;
    12821296
    12831297  if (VERBOSE > 0)
Note: See TracChangeset for help on using the changeset viewer.