Changeset 1412


Ignore:
Timestamp:
Apr 8, 2009 5:04:13 AM (11 years ago)
Author:
pbonami
Message:

Fix problem signaled by Kipp Martin try to make finalize_solution nicer to windows

Location:
trunk/Bonmin/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/src/Algorithms/BonBabSetupBase.cpp

    r1371 r1412  
    8686      roptions_(other.roptions_),
    8787      readOptions_(other.readOptions_),
     88      lpMessageHandler_(NULL),
    8889      prefix_(other.prefix_)
    8990  {
     
    9697    if (other.lpMessageHandler_) {
    9798      lpMessageHandler_ = other.lpMessageHandler_->clone();
    98     }
    99     continuousSolver_->passInMessageHandler(lpMessageHandler_);
     99      continuousSolver_->passInMessageHandler(lpMessageHandler_);
     100    }
    100101    for (CuttingMethods::const_iterator i = other.cutGenerators_.begin() ; i != other.cutGenerators_.end() ; i++) {
    101102      cutGenerators_.push_back(*i);
     
    136137      roptions_(other.roptions_),
    137138      readOptions_(other.readOptions_),
     139      lpMessageHandler_(NULL),
    138140      prefix_(other.prefix_)
    139141  {
     
    186188      roptions_(other.roptions_),
    187189      readOptions_(other.readOptions_),
     190      lpMessageHandler_(NULL),
    188191      prefix_(prefix)
    189192  {
     
    192195      options_ = new OptionsList;
    193196      *options_ = *other.options_;
     197    }
     198    if (other.lpMessageHandler_) {
     199      lpMessageHandler_ = other.lpMessageHandler_->clone();
     200      continuousSolver_->passInMessageHandler(lpMessageHandler_);
    194201    }
    195202    CoinCopyN(defaultIntParam_, NumberIntParam, intParam_);
  • trunk/Bonmin/src/CbcBonmin/Heuristics/BonPumpForMinlp.cpp

    r1408 r1412  
    6565     "pump_for_minlp",
    6666     "if yes runs FP for MINLP",
    67      "yes",
     67     "no",
    6868     "no", "don't run it",
    6969     "yes", "runs the heuristic",
  • trunk/Bonmin/src/Interfaces/BonTMINLP2TNLP.cpp

    r1405 r1412  
    471471   
    472472    IpBlasDcopy(n, x, 1, x_sol_(), 1);
    473 
     473   
     474    if(m > 0){
    474475    g_sol_.resize(m);
    475476    IpBlasDcopy(m, g, 1, g_sol_(), 1);
     477    }
    476478    duals_sol_.resize(m + 2*n);
    477479    if(lambda){
     480      if(m > 0)
    478481      IpBlasDcopy(m, lambda, 1, duals_sol_() + 2*n, 1);
    479482     
Note: See TracChangeset for help on using the changeset viewer.