- Timestamp:
- Nov 24, 2010 5:46:22 AM (10 years ago)
- Location:
- trunk/Clp/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/ClpPresolve.cpp
r1596 r1635 114 114 bool keepIntegers, 115 115 int numberPasses, 116 bool dropNames, 116 117 bool doRowObjective) 117 118 { … … 122 123 saveFile_ = fileName; 123 124 si.saveModel(saveFile_.c_str()); 124 ClpSimplex * model = gutsOfPresolvedModel(&si, feasibilityTolerance, keepIntegers, numberPasses, true,125 ClpSimplex * model = gutsOfPresolvedModel(&si, feasibilityTolerance, keepIntegers, numberPasses, dropNames, 125 126 doRowObjective); 126 127 if (model == &si) { … … 305 306 } else { 306 307 originalModel_->setProblemStatus( presolvedModel_->status()); 308 // but not if close to feasible 309 if( originalModel_->sumPrimalInfeasibilities()<1.0e-1) { 310 originalModel_->setProblemStatus( -1); 311 // Say not optimal after presolve 312 originalModel_->setSecondaryStatus(7); 313 } 307 314 } 308 315 #ifndef CLP_NO_STD … … 1523 1530 #ifndef CLP_NO_STD 1524 1531 originalModel->setLengthNames(lengthNames); 1532 presolvedModel_->dropNames(); 1525 1533 } else { 1526 1534 presolvedModel_ = originalModel; 1527 } 1528 presolvedModel_->dropNames(); 1535 if (dropNames) 1536 presolvedModel_->dropNames(); 1537 } 1529 1538 #endif 1530 1539 -
trunk/Clp/src/ClpPresolve.hpp
r1525 r1635 46 46 #ifndef CLP_NO_STD 47 47 /** This version saves data in a file. The passed in model 48 is updated to be presolved model. names are always dropped.48 is updated to be presolved model. 49 49 Returns non-zero if infeasible*/ 50 50 int presolvedModelToFile(ClpSimplex &si, std::string fileName, … … 52 52 bool keepIntegers = true, 53 53 int numberPasses = 5, 54 bool dropNames = false, 54 55 bool doRowObjective = false); 55 56 #endif
Note: See TracChangeset
for help on using the changeset viewer.