Changeset 1650 for trunk

Timestamp:

Dec 20, 2010 7:39:29 AM (9 years ago)

Author:

forrest

Message:

save some memory

File:

• trunk/Clp/src/ClpSolve.cpp (modified) (8 diffs)

trunk/Clp/src/ClpSolve.cpp

@@ -421 +421 @@
      if (!status_)
           allSlackBasis();
-     ClpPresolve pinfo;
-     pinfo.setSubstitution(options.substitution());
+     ClpPresolve * pinfo = new ClpPresolve();
+     pinfo->setSubstitution(options.substitution());
      int presolveOptions = options.presolveActions();
      bool presolveToFile = (presolveOptions & 0x40000000) != 0;
      presolveOptions &= ~0x40000000;
      if ((presolveOptions & 0xffff) != 0)
-          pinfo.setPresolveActions(presolveOptions);
+          pinfo->setPresolveActions(presolveOptions);
      // switch off singletons to slacks
-     //pinfo.setDoSingletonColumn(false); // done by bits
+     //pinfo->setDoSingletonColumn(false); // done by bits
      int printOptions = options.getSpecialOption(5);
      if ((printOptions & 1) != 0)
-          pinfo.statistics();
+          pinfo->statistics();
      double timePresolve = 0.0;
      double timeIdiot = 0.0;
@@ -463 +463 @@
                costedSlacks = true;
                // switch on singletons to slacks
-               pinfo.setDoSingletonColumn(true);
+               pinfo->setDoSingletonColumn(true);
                // gub stuff for testing
-               //pinfo.setDoGubrow(true);
+               //pinfo->setDoGubrow(true);
           }
 #ifndef CLP_NO_STD
@@ -471 +471 @@
                // PreSolve to file - not fully tested
                printf("Presolving to file - presolve.save\n");
-               pinfo.presolvedModelToFile(*this, "presolve.save", dblParam_[ClpPresolveTolerance],
+               pinfo->presolvedModelToFile(*this, "presolve.save", dblParam_[ClpPresolveTolerance],
                                           false, numberPasses);
                model2 = this;
           } else {
 #endif
-               model2 = pinfo.presolvedModel(*this, dblParam_[ClpPresolveTolerance],
+               model2 = pinfo->presolvedModel(*this, dblParam_[ClpPresolveTolerance],
                                              false, numberPasses, true, costedSlacks);
 #ifndef CLP_NO_STD
@@ -494 +494 @@
                problemStatus_ = 1; // may be unbounded but who cares
                if (options.infeasibleReturn() || (moreSpecialOptions_ & 1) != 0) {
+                 delete pinfo;
                     return -1;
                }
@@ -503 +504 @@
               if (rcode==2) {
                   delete model2;
+                 delete pinfo;
                   return -2;
               } else if (rcode==3) {
                   delete model2;
+                 delete pinfo;
                   return -3;
               }
           }
+          model2->setMoreSpecialOptions(model2->moreSpecialOptions()&(~1024));
           model2->eventHandler()->setSimplex(model2);
           // We may be better off using original (but if dual leave because of bounds)
@@ -2469 +2473 @@
           else
                setLogLevel(CoinMin(0, saveLevel));
-          pinfo.postsolve(true);
+          pinfo->postsolve(true);
+          delete pinfo;
+          pinfo = NULL;
           factorization_->areaFactor(model2->factorization()->adjustedAreaFactor());
           time2 = CoinCpuTime();
@@ -2577 +2583 @@
      }
      eventHandler()->event(ClpEventHandler::presolveEnd);
+     delete pinfo;
      return finalStatus;
 }
@@ -2701 +2708 @@
 {
 }
-// See header file for deatils
+// See header file for details
 void
 ClpSolve::setSpecialOption(int which, int value, int extraInfo)