Changeset 747 for trunk

Timestamp:

Aug 12, 2007 6:02:34 AM (14 years ago)

Author:

forrest

Message:

max times and fix bug in fpump

Location:

trunk/Cbc/src

Files:

• CbcHeuristic.cpp (modified) (1 diff)
• CbcHeuristicFPump.cpp (modified) (13 diffs)
• CbcModel.cpp (modified) (2 diffs)
• CbcModel.hpp (modified) (2 diffs)
• CbcSolver.cpp (modified) (1 diff)

trunk/Cbc/src/CbcHeuristic.cpp

@@ -191 +191 @@
       model.setMaximumCutPassesAtRoot(CoinMin(20,model_->getMaximumCutPassesAtRoot()));
       model.setParentModel(*model_);
+      model.setOriginalColumns(process.originalColumns());
       model.branchAndBound();
       if (logLevel>1)

trunk/Cbc/src/CbcHeuristicFPump.cpp

@@ -17 +17 @@
 #include "CoinWarmStartBasis.hpp"
 #include "CoinTime.hpp"
+#include "CbcEventHandler.hpp"
 
 
@@ -273 +274 @@
   int numberTries=0;
   CoinWarmStartBasis bestBasis;
-  while (true) {
+  bool exitAll=false;
+  double saveBestObjective = model_->getMinimizationObjValue();
+  while (!exitAll) {
     int numberPasses=0;
     numberTries++;
@@ -358 +361 @@
     while (!finished) {
       returnCode=0;
+      if (model_->getCurrentSeconds()>model_->getMaximumSeconds()) {
+        exitAll=true;
+        break;
+      }
       // see what changed
       if (usedColumn) {
@@ -391 +398 @@
         newLineNeeded=false;
         if (newSolutionValue<solutionValue) {
-          double saveValue = newSolutionValue;
+          double saveValue = solutionValue;
           if (!doGeneral) {
             int numberLeft=0;
@@ -412 +419 @@
                 returnCode &= ~2;
               }
+              if (returnCode!=1)
+                newSolutionValue=saveValue;
             }
           }
           if (returnCode&&newSolutionValue<saveValue) {
             memcpy(betterSolution,newSolution,numberColumns*sizeof(double));
+            solutionFound=true;
             CoinWarmStartBasis * basis =
               dynamic_cast<CoinWarmStartBasis *>(solver->getWarmStart()) ;
@@ -421 +431 @@
               bestBasis = * basis;
               delete basis;
+              CbcEventHandler * handler = model_->getEventHandler();
+              if (handler) {
+                double * saveOldSolution = CoinCopyOfArray(model_->bestSolution(),numberColumns);
+                double saveObjectiveValue = model_->getMinimizationObjValue();
+                model_->setBestSolution(betterSolution,numberColumns,newSolutionValue);
+                int action = handler->event(CbcEventHandler::heuristicSolution);
+                if (saveOldSolution) {
+                  model_->setBestSolution(saveOldSolution,numberColumns,saveObjectiveValue);
+                  delete [] saveOldSolution;
+                }
+                if (!action||model_->getCurrentSeconds()>model_->getMaximumSeconds()) {
+                  exitAll=true; // exit
+                  break;
+                }
+              }
             }
             if ((accumulate_&1)!=0)
@@ -434 +459 @@
             pumpPrint[0]='\0';
           } else {
-            sprintf(pumpPrint+strlen(pumpPrint)," - not improved by mini branch and bound");
+            sprintf(pumpPrint+strlen(pumpPrint)," - mini branch and bound could not fix general integers");
             model_->messageHandler()->message(CBC_FPUMP1,model_->messages())
               << pumpPrint
@@ -565 +590 @@
               CoinWarmStartBasis * basis =
                 dynamic_cast<CoinWarmStartBasis *>(solver->getWarmStart()) ;
+              solutionFound=true;
               if (basis) {
                 bestBasis = * basis;
                 delete basis;
+                CbcEventHandler * handler = model_->getEventHandler();
+                if (handler) {
+                  double * saveOldSolution = CoinCopyOfArray(model_->bestSolution(),numberColumns);
+                  double saveObjectiveValue = model_->getMinimizationObjValue();
+                  model_->setBestSolution(betterSolution,numberColumns,newSolutionValue);
+                  int action = handler->event(CbcEventHandler::heuristicSolution);
+                  if (saveOldSolution) {
+                    model_->setBestSolution(saveOldSolution,numberColumns,saveObjectiveValue);
+                    delete [] saveOldSolution;
+                  }
+                  if (!action||model_->getCurrentSeconds()>model_->getMaximumSeconds()) {
+                    exitAll=true; // exit
+                    break;
+                  }
+                }
               }
               if ((accumulate_&1)!=0)
@@ -689 +730 @@
       scaleFactor *= weightFactor_;
     } // END WHILE
-    if (!solutionFound) {
+    if (!solutionFound) 
       sprintf(pumpPrint+strlen(pumpPrint),"No solution found this major pass");
+    if (strlen(pumpPrint)) {
       model_->messageHandler()->message(CBC_FPUMP1,model_->messages())
         << pumpPrint
@@ -701 +743 @@
     delete [] oldSolution;
     delete [] saveObjective;
-    if (usedColumn) {
+    if (usedColumn&&!exitAll) {
       OsiSolverInterface * newSolver = model_->continuousSolver()->clone();
       const double * colLower = newSolver->getColLower();
@@ -829 +871 @@
           bestBasis = * basis;
           delete basis;
+          CbcEventHandler * handler = model_->getEventHandler();
+          if (handler) {
+            double * saveOldSolution = CoinCopyOfArray(model_->bestSolution(),numberColumns);
+            double saveObjectiveValue = model_->getMinimizationObjValue();
+            model_->setBestSolution(betterSolution,numberColumns,newSolutionValue);
+            int action = handler->event(CbcEventHandler::heuristicSolution);
+            if (saveOldSolution) {
+              model_->setBestSolution(saveOldSolution,numberColumns,saveObjectiveValue);
+              delete [] saveOldSolution;
+            }
+            if (!action||model_->getCurrentSeconds()>model_->getMaximumSeconds()) {
+              exitAll=true; // exit
+              break;
+            }
+          }
         }
       } else {
@@ -842 +899 @@
     if (solutionFound) finalReturnCode=1;
     cutoff = CoinMin(cutoff,solutionValue);
-    if (numberTries>=maximumRetries_||!solutionFound) {
+    if (numberTries>=maximumRetries_||!solutionFound||exitAll) {
       break;
     } else if (absoluteIncrement_>0.0||relativeIncrement_>0.0) {
@@ -912 +969 @@
   if (bestBasis.getNumStructural())
     model_->setBestSolutionBasis(bestBasis);
+  model_->setMinimizationObjValue(saveBestObjective);
   return finalReturnCode;
 }

trunk/Cbc/src/CbcModel.cpp

@@ -513 +513 @@
   strongInfo_[2]=0;
   numberStrongIterations_ = 0;
+  // Initialize random seed
+  CoinSeedRandom(1234567);
 #ifndef NDEBUG
   {
@@ -10087 +10089 @@
   }
 }
+// Set original columns as created by preprocessing
+void 
+CbcModel::setOriginalColumns(const int * originalColumns) 
+{
+  int numberColumns = getNumCols();
+  delete [] originalColumns_;
+  originalColumns_ = CoinCopyOfArray(originalColumns,numberColumns);
+}
 // Set the cut modifier method
 void 

trunk/Cbc/src/CbcModel.hpp

@@ -732 +732 @@
   inline int howOftenGlobalScan() const
   { return howOftenGlobalScan_;}
-  /// Original columns as created by integerPresolve
+  /// Original columns as created by integerPresolve or preprocessing
   inline int * originalColumns() const
   { return originalColumns_;}
+  /// Set original columns as created by preprocessing
+  void setOriginalColumns(const int * originalColumns) ;
 
   /** Set the print frequency.
@@ -1966 +1968 @@
   bool ownObjects_;
   
-  /// Original columns as created by integerPresolve
+  /// Original columns as created by integerPresolve or preprocessing
   int * originalColumns_;
   /// How often to scan global cuts

trunk/Cbc/src/CbcSolver.cpp

@@ -3409 +3409 @@
                     solver2->setHintParam(OsiDoInBranchAndCut,false,OsiHintDo) ;
                 }
+                babModel->setOriginalColumns(process.originalColumns());
 #ifdef COIN_HAS_ASL
                 if (!solver2&&usingAmpl) {