Changeset 78

Timestamp:

Mar 13, 2005 12:31:48 PM (17 years ago)

Author:

forrest

Message:

stupid tolerance use

Location:

trunk

Files:

• CbcModel.cpp (modified) (7 diffs)
• CbcNode.cpp (modified) (3 diffs)

trunk/CbcModel.cpp

@@ -538 +538 @@
     int preferredWay ;
     int numberUnsatisfied = 0 ;
-    double integerTolerance = getIntegerTolerance() ;
-
     memcpy(currentSolution_,solver_->getColSolution(),
            numberColumns*sizeof(double)) ;
@@ -546 +544 @@
     { double infeasibility =
           object_[iObject]->infeasibility(preferredWay) ;
-      if (infeasibility > integerTolerance) numberUnsatisfied++ ; }
+      if (infeasibility ) numberUnsatisfied++ ; }
     if (numberUnsatisfied)
     { feasible = solveWithCuts(cuts,maximumCutPassesAtRoot_,
@@ -3940 +3938 @@
   double sumUnsatisfied=0.0;
   int preferredWay;
-  double integerTolerance = getIntegerTolerance();
   int j;
   // Put current solution in safe place
@@ -3948 +3945 @@
     const CbcObject * object = object_[j];
     double infeasibility = object->infeasibility(preferredWay);
-    if (infeasibility>integerTolerance) {
+    if (infeasibility) {
+      assert (infeasibility>0);
       numberUnsatisfied++;
       sumUnsatisfied += infeasibility;
@@ -3957 +3955 @@
     const CbcObject * object = object_[j];
     double infeasibility = object->infeasibility(preferredWay);
-    if (infeasibility>integerTolerance) {
+    if (infeasibility) {
+      assert (infeasibility>0);
       numberUnsatisfied++;
       sumUnsatisfied += infeasibility;
@@ -5181 +5180 @@
     int preferredWay ;
     int numberUnsatisfied = 0 ;
-    double integerTolerance = getIntegerTolerance() ;
-
     memcpy(currentSolution_,solver_->getColSolution(),
            numberColumns*sizeof(double)) ;
@@ -5189 +5186 @@
     { double infeasibility =
           object_[iObject]->infeasibility(preferredWay) ;
-      if (infeasibility > integerTolerance) numberUnsatisfied++ ; }
+      if (infeasibility) numberUnsatisfied++ ; }
     if (numberUnsatisfied)
     { feasible = solveWithCuts(cuts,maximumCutPassesAtRoot_,

trunk/CbcNode.cpp

@@ -938 +938 @@
     */
     int iSmallest = 0;
-    double mostAway = integerTolerance;
+    double mostAway = 1.0e-100;
     for (i = 0 ; i < maximumStrong ; i++) choice[i].possibleBranch = NULL ;
     numberStrong=0;
@@ -992 +992 @@
         }
       }
-      if (infeasibility>integerTolerance) {
+      if (infeasibility) {
+        //if (infeasibility<=integerTolerance) 
+          //printf("XXXXX small %g\n",infeasibility);
         // Increase estimated degradation to solution
         estimatedDegradation += CoinMin(object->upEstimate(),object->downEstimate());
@@ -1006 +1008 @@
           }
           bestPriority = priorityLevel;
-          mostAway=integerTolerance;
+          mostAway=1.0e-100;
           numberStrong=0;
         } else if (priorityLevel>bestPriority) {