Changeset 1248


Ignore:
Timestamp:
Oct 12, 2009 9:49:30 AM (10 years ago)
Author:
forrest
Message:

try and fix gamsTest error

File:
1 edited

Legend:

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

    r1247 r1248  
    44364436  // Check if bounds are all integral (as may get messed up later)
    44374437  checkModel();
    4438   assert (!solverCharacteristics_);
    4439   OsiBabSolver * solverCharacteristics = dynamic_cast<OsiBabSolver *> (solver_->getAuxiliaryInfo());
    4440   if (solverCharacteristics) {
    4441     solverCharacteristics_ = solverCharacteristics;
    4442   } else {
    4443     // replace in solver
    4444     OsiBabSolver defaultC;
    4445     solver_->setAuxiliaryInfo(&defaultC);
    4446     solverCharacteristics_ = dynamic_cast<OsiBabSolver *> (solver_->getAuxiliaryInfo());
     4438  if (!solverCharacteristics_) {
     4439    OsiBabSolver * solverCharacteristics = dynamic_cast<OsiBabSolver *> (solver_->getAuxiliaryInfo());
     4440    if (solverCharacteristics) {
     4441      solverCharacteristics_ = solverCharacteristics;
     4442    } else {
     4443      // replace in solver
     4444      OsiBabSolver defaultC;
     4445      solver_->setAuxiliaryInfo(&defaultC);
     4446      solverCharacteristics_ = dynamic_cast<OsiBabSolver *> (solver_->getAuxiliaryInfo());
     4447    }
    44474448  }
    44484449  solverCharacteristics_->setSolver(solver_);
Note: See TracChangeset for help on using the changeset viewer.