Changeset 1247


Ignore:
Timestamp:
Oct 11, 2009 5:40:49 AM (10 years ago)
Author:
forrest
Message:

threaded heuristics fix

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcModel.cpp

    r1242 r1247  
    99609960  for (i=0;i<numberCutGenerators_;i++)
    99619961    generator_[i]->refreshModel(this);
     9962
     9963  if (!solverCharacteristics_) {
     9964    OsiBabSolver * solverCharacteristics = dynamic_cast<OsiBabSolver *> (solver_->getAuxiliaryInfo());
     9965    if (solverCharacteristics) {
     9966      solverCharacteristics_ = solverCharacteristics;
     9967    } else {
     9968      // replace in solver
     9969      OsiBabSolver defaultC;
     9970      solver_->setAuxiliaryInfo(&defaultC);
     9971      solverCharacteristics_ = dynamic_cast<OsiBabSolver *> (solver_->getAuxiliaryInfo());
     9972    }
     9973  }
     9974
     9975  solverCharacteristics_->setSolver(solver_);
    99629976}
    99639977
     
    1606916083  synchronizeModel() ;
    1607016084
    16071   if (!solverCharacteristics_) {
    16072     OsiBabSolver * solverCharacteristics = dynamic_cast<OsiBabSolver *> (solver_->getAuxiliaryInfo());
    16073     if (solverCharacteristics) {
    16074       solverCharacteristics_ = solverCharacteristics;
    16075     } else {
    16076       // replace in solver
    16077       OsiBabSolver defaultC;
    16078       solver_->setAuxiliaryInfo(&defaultC);
    16079       solverCharacteristics_ = dynamic_cast<OsiBabSolver *> (solver_->getAuxiliaryInfo());
    16080     }
    16081   }
    16082 
    16083   solverCharacteristics_->setSolver(solver_);
    1608416085  // Set so we can tell we are in initial phase in resolve
    1608516086  continuousObjective_ = -COIN_DBL_MAX ;
Note: See TracChangeset for help on using the changeset viewer.