Changeset 76

Timestamp:

Mar 4, 2005 1:26:23 PM (16 years ago)

Author:

forrest

Message:

relax assertions

File:

• trunk/CbcBranchLotsize.cpp (modified) (3 diffs)

trunk/CbcBranchLotsize.cpp

@@ -427 +427 @@
   value = CoinMax(value, lower[columnNumber_]);
   value = CoinMin(value, upper[columnNumber_]);
+  double integerTolerance = 
+    model_->getDblParam(CbcModel::CbcIntegerTolerance);
   /*printf("%d %g %g %g %g\n",columnNumber_,value,lower[columnNumber_],
     solution[columnNumber_],upper[columnNumber_]);*/
-  assert (value>=bound_[0]&&value<=bound_[rangeType_*numberRanges_-1]);
-  double integerTolerance = 
-    model_->getDblParam(CbcModel::CbcIntegerTolerance);
+  assert (value>=bound_[0]-integerTolerance
+          &&value<=bound_[rangeType_*numberRanges_-1]+integerTolerance);
   double infeasibility=0.0;
   bool feasible = findRange(value);
@@ -513 +514 @@
 #endif
   // Scaling may have moved it a bit
-  assert (fabs(value-nearest)<=100.0*integerTolerance);
+  // Lotsizing variables could be a lot larger
+  assert (fabs(value-nearest)<=(100.0+10.0*fabs(nearest))*integerTolerance);
 }
 
@@ -596 +598 @@
   double integerTolerance = 
     model_->getDblParam(CbcModel::CbcIntegerTolerance);
-  assert (fabs(value-nearest)<=integerTolerance);
+  // Scaling may have moved it a bit
+  // Lotsizing variables could be a lot larger
+  assert (fabs(value-nearest)<=(10.0+10.0*fabs(nearest))*integerTolerance);
   double dj = solver->getObjSense()*solver->getReducedCost()[columnNumber_];
   CbcLotsizeBranchingObject * object = NULL;