Changeset 1635 for trunk

Timestamp:

Nov 24, 2010 5:46:22 AM (9 years ago)

Author:

forrest

Message:

fix bug when presolved model infeasible but original feasible.
also allow names in presolve to file.

Location:

trunk/Clp/src

Files:

• ClpPresolve.cpp (modified) (4 diffs)
• ClpPresolve.hpp (modified) (2 diffs)

trunk/Clp/src/ClpPresolve.cpp

@@ -114 +114 @@
                                   bool keepIntegers,
                                   int numberPasses,
+                                  bool dropNames,
                                   bool doRowObjective)
 {
@@ -122 +123 @@
      saveFile_ = fileName;
      si.saveModel(saveFile_.c_str());
-     ClpSimplex * model = gutsOfPresolvedModel(&si, feasibilityTolerance, keepIntegers, numberPasses, true,
+     ClpSimplex * model = gutsOfPresolvedModel(&si, feasibilityTolerance, keepIntegers, numberPasses, dropNames,
                           doRowObjective);
      if (model == &si) {
@@ -305 +306 @@
      } else {
           originalModel_->setProblemStatus( presolvedModel_->status());
+          // but not if close to feasible
+          if( originalModel_->sumPrimalInfeasibilities()<1.0e-1) {
+               originalModel_->setProblemStatus( -1);
+               // Say not optimal after presolve
+               originalModel_->setSecondaryStatus(7);
+          }
      }
 #ifndef CLP_NO_STD
@@ -1523 +1530 @@
 #ifndef CLP_NO_STD
                originalModel->setLengthNames(lengthNames);
+               presolvedModel_->dropNames();
           } else {
                presolvedModel_ = originalModel;
-          }
-          presolvedModel_->dropNames();
+               if (dropNames)
+                 presolvedModel_->dropNames();
+          }
 #endif
 

trunk/Clp/src/ClpPresolve.hpp

@@ -46 +46 @@
 #ifndef CLP_NO_STD
      /** This version saves data in a file.  The passed in model
-         is updated to be presolved model.  names are always dropped.
+         is updated to be presolved model.  
          Returns non-zero if infeasible*/
      int presolvedModelToFile(ClpSimplex &si, std::string fileName,
@@ -52 +52 @@
                               bool keepIntegers = true,
                               int numberPasses = 5,
+                              bool dropNames = false,
                               bool doRowObjective = false);
 #endif