Changeset 2332 for trunk


Ignore:
Timestamp:
Aug 31, 2018 1:21:34 PM (14 months ago)
Author:
forrest
Message:

more tweaks for marginal feasible

Location:
trunk/Clp/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpSolve.cpp

    r2321 r2332  
    38053805               double sumPrimal=sumPrimalInfeasibilities_;
    38063806               double sumDual=sumDualInfeasibilities_;
     3807               if (sumDual>1.0e-6&&sumPrimal>1.0e-6)
     3808                 moreSpecialOptions_ &= ~2; // be safe and do final solve
    38073809               // ignore some parts of solution
    38083810               if (finalStatus == 1) {
  • trunk/Clp/src/OsiClp/OsiClpSolverInterface.cpp

    r2322 r2332  
    50525052    basis_ = rhs.basis_;
    50535053    stuff_ = rhs.stuff_;
     5054    delete [] integerInformation_;
     5055    integerInformation_=NULL;
    50545056    if (rhs.integerInformation_) {
    50555057      int numberColumns = modelPtr_->numberColumns();
  • trunk/Clp/src/OsiClp/OsiClpSolverInterface.hpp

    r2315 r2332  
    487487  /// Set integer type (0,1,2=optional,3=sc,4=scint)
    488488  inline void setIntegerType(int colIndex,int value)
    489   { integerInformation_[colIndex] = value;}
     489  { integerInformation_[colIndex] = static_cast<char>(value);}
    490490  /// Get pointer to row-wise copy of matrix
    491491  virtual const CoinPackedMatrix * getMatrixByRow() const;
     
    12681268  /// Sort of lexicographic resolve
    12691269  void lexSolve();
     1270  /// Get continuous model
     1271  inline ClpSimplex * getContinuousModel() const
     1272  { return continuousModel_;}
     1273  /// Set continuous model
     1274  inline void setContinuousModel(ClpSimplex * model)
     1275  { continuousModel_ = model;}
    12701276  //@}
    12711277 
Note: See TracChangeset for help on using the changeset viewer.