Changeset 96


Ignore:
Timestamp:
Oct 27, 2006 4:28:58 PM (13 years ago)
Author:
pbonami
Message:

Resolve small problems in unitTest

Location:
branches/devel/Bonmin/src/Interfaces
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/src/Interfaces/BonOsiTMINLPInterface.cpp

    r92 r96  
    338338    }
    339339#endif         
    340                               
     340     
    341341}
    342342
  • branches/devel/Bonmin/src/Interfaces/BonTMINLP2TNLP.cpp

    r90 r96  
    232232  }
    233233
    234   void TMINLP2TNLP::setDualsInit(Index n, const Number* duals_init)
    235   {
    236     DBG_ASSERT(n == m_ );
     234  void TMINLP2TNLP::setDualsInit(Index m, const Number* duals_init)
     235  {
     236    DBG_ASSERT(m == m_ + 2*n_ );
    237237
    238238    if(!duals_init_)
    239       duals_init_ = &x_init_[n_];
    240 
    241     IpBlasDcopy(n, duals_init, 1, duals_init_, 1);
     239      duals_init_ = x_init_ + n_;
     240
     241    IpBlasDcopy(m, duals_init, 1, duals_init_, 1);
    242242
    243243  }
  • branches/devel/Bonmin/src/Interfaces/BonTNLPSolver.cpp

    r67 r96  
    2424    double * g_u = new double[m];
    2525   
    26     tnlp->get_bounds_info(m, x_l, x_u, m, g_l , g_u);
     26    tnlp->get_bounds_info(n, x_l, x_u, m, g_l , g_u);
    2727   
    2828
  • branches/devel/Bonmin/src/Interfaces/Ipopt/BonIpoptSolver.cpp

    r86 r96  
    212212                          Ipopt::SmartPtr<TMINLP2TNLP> tnlp)
    213213{
    214   if(!warmstart || !warmStartStrategy_)
     214  if(!warmstart && warmStartStrategy_)
    215215    return 0;
    216216  const IpoptWarmStart * ws = dynamic_cast<const IpoptWarmStart*> (warmstart);
Note: See TracChangeset for help on using the changeset viewer.