Changes in stable/2.9/Cbc/src [2175:2154]

Location:

stable/2.9/Cbc/src

Files:

• CbcCutGenerator.cpp (modified) (2 diffs)
• CbcHeuristic.cpp (modified) (1 diff)
• CbcModel.cpp (modified) (2 diffs)
• CbcNode.cpp (modified) (2 diffs)
• CbcSolver.cpp (modified) (3 diffs)
• Makefile.in (modified) (3 diffs)
• OsiCbc/Makefile.in (modified) (3 diffs)
• config_cbc_default.h (modified) (2 diffs)

stable/2.9/Cbc/src/CbcCutGenerator.cpp

@@ -430 +430 @@
                     printf("On optimal path CbcCut\n");
                     int nCols = solver->getNumCols();
+                    int i;
                     const double * optimal = debugger->optimalSolution();
                     const double * objective = solver->getObjCoefficients();
                     double objval1 = 0.0, objval2 = 0.0;
-                    for (int i = 0; i < nCols; i++) {
-                        if (!solver->isInteger(i))
-                          continue;
+                    for (i = 0; i < nCols; i++) {
 #if CGL_DEBUG>1
                         printf("%d %g %g %g %g\n", i, lower[i], solution[i], upper[i], optimal[i]);
@@ -617 +616 @@
             const OsiRowCutDebugger * debugger = solver->getRowCutDebugger();
 #endif
-            //#define WEAKEN_CUTS 1
-#ifdef WEAKEN_CUTS
-            const double * lower = solver->getColLower();
-            const double * upper = solver->getColUpper();
-            const double * solution = solver->getColSolution();
-#endif
             for (k = numberRowCutsBefore; k < numberRowCutsAfter; k++) {
                 OsiRowCut * thisCut = cs.rowCutPtr(k) ;
-#ifdef WEAKEN_CUTS
-                // weaken cut if coefficients not integer
-                double lb=thisCut->lb();
-                double ub=thisCut->ub();
-                if (lb<-1.0e100||ub>1.0e100) {
-                  // normal cut
-                  CoinPackedVector rpv = thisCut->row();
-                  const int n = rpv.getNumElements();
-                  const int * indices = rpv.getIndices();
-                  const double * elements = rpv.getElements();
-                  double bound=0.0;
-                  double sum=0.0;
-                  bool integral=true;
-                  int nInteger=0;
-                  for (int k=0; k<n; k++) {
-                    double value = fabs(elements[k]);
-                    int column=indices[k];
-                    sum += value;
-                    if (value!=floor(value+0.5))
-                      integral=false;
-                    if (solver->isInteger(column)) {
-                      nInteger++;
-                      double largerBound = CoinMax(fabs(lower[column]),
-                                                   fabs(upper[column]));
-                      double solutionBound=fabs(solution[column])+10.0;
-                      bound += CoinMin(largerBound,solutionBound);
-                    }
-                  }
-#if WEAKEN_CUTS ==1
-                  // leave if all 0-1
-                  if (nInteger==bound)
-                    integral=true;
-#elif WEAKEN_CUTS==4||WEAKEN_CUTS==5
-                  // leave if all 0-1
-                  if (nInteger==bound && n < 40)
-                    integral=true;
-#endif
-                  if (!integral) {
-                    double weakenBy=1.0e-7*(bound+sum);
-#if WEAKEN_CUTS==3||WEAKEN_CUTS==5
-                    weakenBy *= 10.0;
-#endif              
-                    if (lb<-1.0e100)
-                      thisCut->setUb(ub+weakenBy);
-                    else
-                      thisCut->setLb(lb-weakenBy);
-                  }
-                }
-#endif
 #ifdef CGL_DEBUG
                 if (debugger && debugger->onOptimalPath(*solver)) {
-                  if(debugger->invalidCut(*thisCut)) {
+                    assert(!debugger->invalidCut(*thisCut));
+                    if(debugger->invalidCut(*thisCut))
                       abort();
-                  }
                 }
 #endif

stable/2.9/Cbc/src/CbcHeuristic.cpp

@@ -2420 +2420 @@
                     way = -1.0;
                     improvement = downImprovement;
-                    if (isInteger&&currentValue<lowerValue+0.99)
-                      continue; // no good
                 } else if (upImprovement > 0.0 && currentValue < upperValue) {
                     way = 1.0;
                     improvement = upImprovement;
-                    if (isInteger&&currentValue>upperValue-0.99)
-                      continue; // no good
                 }
                 if (way) {

stable/2.9/Cbc/src/CbcModel.cpp

@@ -2089 +2089 @@
         }
         originalContinuousObjective_ = COIN_DBL_MAX;
-        if (bestSolution_ && 
-            ((specialOptions_&8388608)==0||(specialOptions_&2048)!=0)) {
-          // best solution found by various heuristics - set solution
-          char general[200];
-          sprintf(general,"Solution of %g already found by heuristic",
-                  bestObjective_);
-          messageHandler()->message(CBC_GENERAL,
-                                    messages())
-            << general << CoinMessageEol ;
-          setCutoff(1.0e50) ; // As best solution should be worse than cutoff
-          // change cutoff as constraint if wanted
-          if (cutoffRowNumber_>=0) {
-            if (solver_->getNumRows()>cutoffRowNumber_)
-              solver_->setRowUpper(cutoffRowNumber_,1.0e50);
-          }
-          // also in continuousSolver_
-          if (continuousSolver_) {
-            // Solvers know about direction
-            double direction = solver_->getObjSense();
-            continuousSolver_->setDblParam(OsiDualObjectiveLimit, 1.0e50*direction);
-          } else {
-            continuousSolver_ = solver_->clone();
-          }
-          phase_ = 5;
-          double increment = getDblParam(CbcModel::CbcCutoffIncrement) ;
-          if ((specialOptions_&4) == 0)
-            bestObjective_ += 100.0 * increment + 1.0e-3; // only set if we are going to solve
-          setBestSolution(CBC_END_SOLUTION, bestObjective_, bestSolution_, 1) ;
-          continuousSolver_->resolve() ;
-          if (!continuousSolver_->isProvenOptimal()) {
-            continuousSolver_->messageHandler()->setLogLevel(2) ;
-            continuousSolver_->initialSolve() ;
-          }
-          delete solver_ ;
-          solver_ = continuousSolver_ ;
-          setPointers(solver_);
-          continuousSolver_ = NULL ;
-        }
         solverCharacteristics_ = NULL;
         if (flipObjective)
@@ -4847 +4809 @@
             double dummyBest;
             tree_->cleanTree(this, -COIN_DBL_MAX, dummyBest) ;
-#if 0 // Does not seem to be needed def CBC_THREAD
+#ifdef CBC_THREAD
             if (parallelMode() > 0 && master_) {
               // see if any dangling nodes

stable/2.9/Cbc/src/CbcNode.cpp

@@ -2367 +2367 @@
                     }
                     delete [] rowActivity;
+                    delete [] solution;
                     if (!satisfied) {
 #ifdef CLP_INVESTIGATE
@@ -2393 +2394 @@
                         }
                     }
-                    delete [] solution;
                 }
             } else if (iPass == 1) {

stable/2.9/Cbc/src/CbcSolver.cpp

@@ -1713 +1713 @@
         gomoryGen.setLimit(50);
         // set default action (0=off,1=on,2=root)
-#ifdef SWAP_GOMORY
-        int gomoryAction = 0;
-#else
         int gomoryAction = 3;
-#endif
 
         CglProbing probingGen;
@@ -1758 +1754 @@
         //GMIGen.setLimit(100);
         // set default action (0=off,1=on,2=root)
-#ifdef SWAP_GOMORY
-        int GMIAction = 3;
-#else
         // Off 
         int GMIAction = 0;
-#endif
 
         CglFakeClique cliqueGen(NULL, false);
@@ -2324 +2316 @@
                                         generalMessageHandler->message(CLP_GENERAL, generalMessages)
                                         << message << CoinMessageEol;
-#ifdef SWAP_GOMORY
-                                    GMIAction = 3;
-                                    message=parameters_[whichParam(CBC_PARAM_STR_GMICUTS, numberParameters_, parameters_)].setCurrentOptionWithMessage("ifmove");
-#else
                                     GMIAction = 2;
                                     message=parameters_[whichParam(CBC_PARAM_STR_GMICUTS, numberParameters_, parameters_)].setCurrentOptionWithMessage("root");
-#endif
                                     if (!noPrinting_&&message) 
                                         generalMessageHandler->message(CLP_GENERAL, generalMessages)

stable/2.9/Cbc/src/Makefile.in

@@ -249 +249 @@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
 COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
-COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
-COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
 COIN_HAS_DYLP_FALSE = @COIN_HAS_DYLP_FALSE@
 COIN_HAS_DYLP_TRUE = @COIN_HAS_DYLP_TRUE@
@@ -257 +255 @@
 COIN_HAS_GRB_FALSE = @COIN_HAS_GRB_FALSE@
 COIN_HAS_GRB_TRUE = @COIN_HAS_GRB_TRUE@
-COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
-COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
 COIN_HAS_MIPLIB3_FALSE = @COIN_HAS_MIPLIB3_FALSE@
 COIN_HAS_MIPLIB3_TRUE = @COIN_HAS_MIPLIB3_TRUE@
@@ -478 +474 @@
 coin_doxy_usedot = @coin_doxy_usedot@
 coin_have_doxygen = @coin_have_doxygen@
-coin_have_latex = @coin_have_latex@
 datadir = @datadir@
 exec_prefix = @exec_prefix@

stable/2.9/Cbc/src/OsiCbc/Makefile.in

@@ -175 +175 @@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
 COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
-COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
-COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
 COIN_HAS_DYLP_FALSE = @COIN_HAS_DYLP_FALSE@
 COIN_HAS_DYLP_TRUE = @COIN_HAS_DYLP_TRUE@
@@ -183 +181 @@
 COIN_HAS_GRB_FALSE = @COIN_HAS_GRB_FALSE@
 COIN_HAS_GRB_TRUE = @COIN_HAS_GRB_TRUE@
-COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
-COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
 COIN_HAS_MIPLIB3_FALSE = @COIN_HAS_MIPLIB3_FALSE@
 COIN_HAS_MIPLIB3_TRUE = @COIN_HAS_MIPLIB3_TRUE@
@@ -404 +400 @@
 coin_doxy_usedot = @coin_doxy_usedot@
 coin_have_doxygen = @coin_have_doxygen@
-coin_have_latex = @coin_have_latex@
 datadir = @datadir@
 exec_prefix = @exec_prefix@

stable/2.9/Cbc/src/config_cbc_default.h

@@ -6 +6 @@
 
 /* Version number of project */
-#define CBC_VERSION "2.9.4"
+#define CBC_VERSION "2.9.3"
 
 /* Major Version number of project */
@@ -15 +15 @@
 
 /* Release Version number of project */
-#define CBC_VERSION_RELEASE 4
+#define CBC_VERSION_RELEASE 3