Ignore:
Timestamp:
Mar 26, 2013 11:23:38 AM (7 years ago)
Author:
forrest
Message:

try to fix infeasibility ray,
changes as in stable (for presolve),
stuff for Cbc parameters

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/OsiClp/OsiClpSolverInterface.cpp

    r1924 r1926  
    133133  int saveMessageLevel2 = messageLevel;
    134134  // Set message handler
    135   solver->passInMessageHandler(handler_);
     135  if (!defaultHandler_)
     136    solver->passInMessageHandler(handler_);
    136137  // But keep log level
    137138  solver->messageHandler()->setLogLevel(saveMessageLevel);
     
    778779  }
    779780  modelPtr_->whatsChanged_ |= 0x30000;
     781#if 0
     782  // delete scaled matrix and rowcopy for safety
     783  delete modelPtr_->scaledMatrix_;
     784  modelPtr_->scaledMatrix_=NULL;
     785  delete modelPtr_->rowCopy_;
     786  modelPtr_->rowCopy_=NULL;
     787#endif
    780788  //std::cout<<time1<<" seconds - total "<<totalTime<<std::endl;
    781789  delete pinfo;
     
    919927  int messageLevel=messageHandler()->logLevel();
    920928  bool oldDefault;
    921   CoinMessageHandler * saveHandler = modelPtr_->pushMessageHandler(handler_,oldDefault);
     929  CoinMessageHandler * saveHandler = NULL;
     930  if (!defaultHandler_)
     931    saveHandler = modelPtr_->pushMessageHandler(handler_,oldDefault);
    922932  //printf("basis before dual\n");
    923933  //basis_.print();
     
    12571267  //printf("basis after dual\n");
    12581268  //basis_.print();
    1259   modelPtr_->popMessageHandler(saveHandler,oldDefault);
     1269  if (!defaultHandler_)
     1270    modelPtr_->popMessageHandler(saveHandler,oldDefault);
    12601271  modelPtr_->messageHandler()->setLogLevel(saveMessageLevel);
    12611272  if (saveSolveType==2) {
     
    29042915                                                        bool fullRay) const
    29052916{
    2906   if (fullRay == true) {
    2907     throw CoinError("Full dual rays not yet implemented.","getDualRays",
    2908                     "OsiClpSolverInterface");
    2909   }
    2910   return std::vector<double*>(1, modelPtr_->infeasibilityRay());
     2917  return std::vector<double*>(1, modelPtr_->infeasibilityRay(fullRay));
    29112918}
    29122919//------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.