Changeset 471 for branches/devel/Cbc/src


Ignore:
Timestamp:
Oct 25, 2006 2:52:34 PM (13 years ago)
Author:
forrest
Message:

for nonlinear codes

Location:
branches/devel/Cbc/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcBranchActual.cpp

    r463 r471  
    879879CbcSimpleInteger::infeasibility(int & preferredWay) const
    880880{
    881   OsiBranchingInformation info(model_->solver());
     881  OsiBranchingInformation info(model_->solver(),model_->normalSolver());
    882882  return infeasibility(model_->solver(),&info,preferredWay);
    883883}
  • branches/devel/Cbc/src/CbcModel.cpp

    r463 r471  
    85758575CbcModel::usefulInformation() const
    85768576{
    8577   OsiBranchingInformation usefulInfo(solver_);
     8577  OsiBranchingInformation usefulInfo(solver_,normalSolver());
    85788578  // and modify
    85798579  usefulInfo.solution_=testSolution_;
  • branches/devel/Cbc/src/CbcModel.hpp

    r439 r471  
    13441344      2 bit (4) - don't check integer solution (by solving LP)
    13451345      3 bit (8) - fast analyze
    1346       4 bit (16) - non-linear model and someone too lazy to code "times" correctly - so skip row check
     1346      4 bit (16) - non-linear model - so no well defined CoinPackedMatrix
    13471347      5 bit (32) - keep names
    13481348      6 bit (64) - try for dominated columns
     
    13541354  inline int specialOptions() const
    13551355  { return specialOptions_;};
     1356  /// Says if normal solver i.e. has well defined CoinPackedMatrix
     1357  inline bool normalSolver() const
     1358  { return (specialOptions_&16)==0;};
    13561359  //@}
    13571360  //---------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.