Changeset 1837 for stable/2.7

Timestamp:

Dec 22, 2012 11:17:37 AM (8 years ago)

Author:

stefan

Message:

undo r1835 and merge r1834 from releases/2.7.8

Location:

stable/2.7/Cbc

Files:

• . (modified) (1 prop)
• src/CbcHeuristic.cpp (modified) (16 diffs)

stable/2.7/Cbc/src/CbcHeuristic.cpp

@@ -118 +118 @@
         numCouldRun_(0),
         numberSolutionsFound_(0),
-        numberNodesDone_(0),
         inputSolution_(NULL)
 {
@@ -146 +145 @@
         numCouldRun_(0),
         numberSolutionsFound_(0),
-        numberNodesDone_(0),
         inputSolution_(NULL)
 {}
@@ -174 +172 @@
     runNodes_ = rhs.runNodes_;
     numberSolutionsFound_ = rhs.numberSolutionsFound_;
-    numberNodesDone_ = rhs.numberNodesDone_;
     if (rhs.inputSolution_) {
         int numberColumns = model_->getNumCols();
@@ -456 +453 @@
 CbcHeuristic::setSeed(int value)
 {
-    if (value==0) {
-      double time = fabs(CoinGetTimeOfDay());
-      while (time>=COIN_INT_MAX)
-        time *= 0.5;
-      value = static_cast<int>(time);
-      char printArray[100];
-      sprintf(printArray, "using time of day seed was changed from %d to %d",
-              randomNumberGenerator_.getSeed(), value);
-      if (model_)
-        model_->messageHandler()->message(CBC_FPUMP1, model_->messages())
-          << printArray
-          << CoinMessageEol;
-    }
     randomNumberGenerator_.setSeed(value);
 }
@@ -723 +707 @@
     {
         int saveLogLevel = solver->messageHandler()->logLevel();
-        if (saveLogLevel == 1) 
+        if (saveLogLevel == 1)
             solver->messageHandler()->setLogLevel(0);
         OsiPresolve * pinfo = new OsiPresolve();
@@ -854 +838 @@
     if (solver->isProvenOptimal()) {
         CglPreProcess process;
-        OsiSolverInterface * solver2 = NULL;
         if ((model_->moreSpecialOptions()&65536)!=0)
           process.setOptions(2+4+8); // no cuts
-        /* Do not try and produce equality cliques and
-           do up to 2 passes (normally) 5 if restart */
-        int numberPasses = 2;
-        if (numberNodes < 0) {
-          numberPasses = 5;
-          // Say some rows cuts
-          int numberRows = solver->getNumRows();
-          if (numberNodes_ < numberRows && true /* think */) {
-            char * type = new char[numberRows];
-            memset(type, 0, numberNodes_);
-            memset(type + numberNodes_, 1, numberRows - numberNodes_);
-            process.passInRowTypes(type, numberRows);
-            delete [] type;
-          }
-        }
-        if (logLevel <= 1)
-          process.messageHandler()->setLogLevel(0);
+        /* Do not try and produce equality cliques and
+           do up to 2 passes (normally) 5 if restart */
+        int numberPasses = 2;
+        if (numberNodes < 0) {
+            numberPasses = 5;
+            // Say some rows cuts
+            int numberRows = solver->getNumRows();
+            if (numberNodes_ < numberRows && true /* think */) {
+                char * type = new char[numberRows];
+                memset(type, 0, numberNodes_);
+                memset(type + numberNodes_, 1, numberRows - numberNodes_);
+                process.passInRowTypes(type, numberRows);
+                delete [] type;
+            }
+        }
+        if (logLevel <= 1)
+            process.messageHandler()->setLogLevel(0);
         if (!solver->defaultHandler()&&
             solver->messageHandler()->logLevel(0)!=-1000)
           process.passInMessageHandler(solver->messageHandler());
-        solver2 = process.preProcessNonDefault(*solver, false,
-                                               numberPasses);
-          if (!solver2) {
+        OsiSolverInterface * solver2 = process.preProcessNonDefault(*solver, false,
+                                       numberPasses);
+        if (!solver2) {
             if (logLevel > 1)
-              printf("Pre-processing says infeasible\n");
+                printf("Pre-processing says infeasible\n");
             returnCode = 2; // so will be infeasible
-          } else {
+        } else {
 #ifdef COIN_DEVELOP_z
             if (numberNodes < 0) {
-              solver2->writeMpsNative("after2.mps", NULL, NULL, 2, 1);
+                solver2->writeMpsNative("after2.mps", NULL, NULL, 2, 1);
             }
 #endif
@@ -916 +899 @@
                     // normal
                     model.setSpecialOptions(saveModelOptions | 2048);
-                    if (logLevel <= 1 && feasibilityPumpOptions_ != -3)
+                    if (logLevel <= 1)
                         model.setLogLevel(0);
                     else
@@ -924 +907 @@
                     model.setCutoff(signedCutoff);
                     // Don't do if original fraction > 1.0 and too large
-                    if (fractionSmall_>1.0 && fractionSmall_ < 1000000.0) {
+                    if (fractionSmall_>1.0) {
                       /* 1.4 means -1 nodes if >.4
                          2.4 means -1 nodes if >.5 and 0 otherwise
@@ -1016 +999 @@
 #endif
                 model.setParentModel(*model_);
-                model.setMaximumSolutions(model_->getMaximumSolutions()); 
-                model.setOriginalColumns(process.originalColumns());
+                model.setOriginalColumns(process.originalColumns());
                 model.setSearchStrategy(-1);
                 // If no feasibility pump then insert a lightweight one
-                if (feasibilityPumpOptions_ >= 0 || feasibilityPumpOptions_ == -2) {
-                    CbcHeuristicFPump * fpump = NULL;
+                if (feasibilityPumpOptions_ >= 0) {
+                    bool gotPump = false;
                     for (int i = 0; i < model.numberHeuristics(); i++) {
-                        CbcHeuristicFPump* pump =
-                            dynamic_cast<CbcHeuristicFPump*>(model.heuristic(i));
-                        if (pump) {
-                            fpump = pump;
-                            break;
-                        }
+                        const CbcHeuristicFPump* pump =
+                            dynamic_cast<const CbcHeuristicFPump*>(model.heuristic(i));
+                        if (pump)
+                            gotPump = true;
                     }
-                    if (!fpump) {
+                    if (!gotPump) {
                         CbcHeuristicFPump heuristic4;
                         // use any cutoff
@@ -1037 +1017 @@
                           heuristic4.setMaximumPasses(10);
                         int pumpTune = feasibilityPumpOptions_;
-                        if (pumpTune==-2)
-                          pumpTune = 4; // proximity
                         if (pumpTune > 0) {
                             /*
@@ -1095 +1073 @@
                         }
                         model.addHeuristic(&heuristic4, "feasibility pump", 0);
-        
                     }
-                } else if (feasibilityPumpOptions_==-3) {
-                  // add all (except this)
-                  for (int i = 0; i < model_->numberHeuristics(); i++) {
-                    if (strcmp(heuristicName(),model_->heuristic(i)->heuristicName()))
-                      model.addHeuristic(model_->heuristic(i)); 
-                  }
-                }
+                }
                 //printf("sol %x\n",inputSolution_);
                 if (inputSolution_) {
@@ -1198 +1169 @@
 #define ALWAYS_DUAL
 #ifdef ALWAYS_DUAL
-                    OsiSolverInterface * solverD = model.solver();
+                    OsiSolverInterface * solver = model.solver();
                     bool takeHint;
                     OsiHintStrength strength;
-                    solverD->getHintParam(OsiDoDualInResolve, takeHint, strength);
-                    solverD->setHintParam(OsiDoDualInResolve, true, OsiHintDo);
+                    solver->getHintParam(OsiDoDualInResolve, takeHint, strength);
+                    solver->setHintParam(OsiDoDualInResolve, true, OsiHintDo);
 #endif
                     model.passInEventHandler(model_->getEventHandler());
@@ -1211 +1182 @@
                     model_->setSpecialOptions(saveOptions);
 #ifdef ALWAYS_DUAL
-                    solverD = model.solver();
-                    solverD->setHintParam(OsiDoDualInResolve, takeHint, strength);
-#endif
-                    numberNodesDone_ = model.getNodeCount();
+                    solver = model.solver();
+                    solver->setHintParam(OsiDoDualInResolve, takeHint, strength);
+#endif
 #ifdef COIN_DEVELOP
                     printf("sub branch %d nodes, %d iterations - max %d\n",
@@ -1268 +1238 @@
                     }
 #endif
-                    //if (fractionSmall_ < 1000000.0) 
-                      process.postProcess(*model.solver());
+                    process.postProcess(*model.solver());
                     if (solver->isProvenOptimal() && solver->getObjValue()*solver->getObjSense() < cutoff) {
                         // Solution now back in solver
@@ -1287 +1256 @@
                                             process.numberIterationsPre() +
                                             process.numberIterationsPost();
-                if (totalNumberIterations > 100*(numberNodes + 10)
-                    && fractionSmall_ < 1000000.0) {
+                if (totalNumberIterations > 100*(numberNodes + 10)) {
                     // only allow smaller problems
                     fractionSmall = fractionSmall_;
@@ -1298 +1266 @@
                 }
                 if (model.status() == 5)
-                    model_->sayEventHappened();
+                  model_->sayEventHappened();
                 if (model.isProvenInfeasible())
                     status = 1;