Changeset 708 for trunk

Timestamp:

Jul 25, 2007 3:58:09 PM (12 years ago)

Author:

forrest

Message:

out ambiguities

Location:

trunk/Cbc/src

Files:

• CbcBranchActual.hpp (modified) (1 diff)
• CbcHeuristicLocal.cpp (modified) (1 diff)
• CbcLinked.cpp (modified) (1 diff)
• CbcModel.hpp (modified) (1 diff)
• CbcNode.cpp (modified) (1 diff)
• unitTestClp.cpp (modified) (1 diff)

trunk/Cbc/src/CbcBranchActual.hpp

@@ -58 +58 @@
   /** Type of each member i.e. which way is strong 0=non SOS, 1 =SOS,
       index is 0 ... numberMembers_-1 */
-  inline const char type(int index) const
+  inline char type(int index) const
   {if (type_) return type_[index]; else return 1;}
 

trunk/Cbc/src/CbcHeuristicLocal.cpp

@@ -176 +176 @@
     return 0;
   numberSolutions_=model_->getSolutionCount();
-  if (model_->getNumCols()>100000&&model_->getNumCols()>
-      10*model_->getNumRows()||numberSolutions_<=1)
+  if ((model_->getNumCols()>100000&&model_->getNumCols()>
+       10*model_->getNumRows())||numberSolutions_<=1)
     return 0; // probably not worth it
   // worth trying

trunk/Cbc/src/CbcLinked.cpp

@@ -5848 +5848 @@
   double movement = xyTrue-xyLambda;
   double mesh=CoinMax(xMeshSize_,yMeshSize_);
-  if (fabs(movement)<xySatisfied_&&(xB[1]-xB[0])<mesh||yB[1]-yB[0]<mesh)
+  if (fabs(movement)<xySatisfied_&&(xB[1]-xB[0]<mesh||yB[1]-yB[0]<mesh))
     return 0.0; // say feasible
   const double * activity = info->rowActivity_;

trunk/Cbc/src/CbcModel.hpp

@@ -850 +850 @@
   { return integerVariable_;}
   /// Whether or not integer
-  inline const char integerType(int i) const
+  inline char integerType(int i) const
   { return integerInfo_[i];}
   /// Whether or not integer

trunk/Cbc/src/CbcNode.cpp

@@ -2870 +2870 @@
         //numberTest2 = 1000000;
       }
-      if (searchStrategy<0||searchStrategy==1)
+      //if (searchStrategy<0||searchStrategy==1)
         //numberTest2 = 1000000;
 #if 0

trunk/Cbc/src/unitTestClp.cpp

@@ -549 +549 @@
         int presolveOff=iAlg/100;
         iAlg=iAlg % 100;
-        if( !barrierAvailable&&iAlg==0)
+        if( !barrierAvailable&&iAlg==0) {
           if (nRows[m]!=2172)
             iAlg = 5; // try primal
           else
             iAlg=3; // d2q06c
+        }
         solveOptions=setupForSolve(iAlg,nameAlgorithm,0);
         if (presolveOff)