Changeset 78


Ignore:
Timestamp:
Mar 13, 2005 12:31:48 PM (16 years ago)
Author:
forrest
Message:

stupid tolerance use

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcModel.cpp

    r70 r78  
    538538    int preferredWay ;
    539539    int numberUnsatisfied = 0 ;
    540     double integerTolerance = getIntegerTolerance() ;
    541 
    542540    memcpy(currentSolution_,solver_->getColSolution(),
    543541           numberColumns*sizeof(double)) ;
     
    546544    { double infeasibility =
    547545          object_[iObject]->infeasibility(preferredWay) ;
    548       if (infeasibility > integerTolerance) numberUnsatisfied++ ; }
     546      if (infeasibility ) numberUnsatisfied++ ; }
    549547    if (numberUnsatisfied)
    550548    { feasible = solveWithCuts(cuts,maximumCutPassesAtRoot_,
     
    39403938  double sumUnsatisfied=0.0;
    39413939  int preferredWay;
    3942   double integerTolerance = getIntegerTolerance();
    39433940  int j;
    39443941  // Put current solution in safe place
     
    39483945    const CbcObject * object = object_[j];
    39493946    double infeasibility = object->infeasibility(preferredWay);
    3950     if (infeasibility>integerTolerance) {
     3947    if (infeasibility) {
     3948      assert (infeasibility>0);
    39513949      numberUnsatisfied++;
    39523950      sumUnsatisfied += infeasibility;
     
    39573955    const CbcObject * object = object_[j];
    39583956    double infeasibility = object->infeasibility(preferredWay);
    3959     if (infeasibility>integerTolerance) {
     3957    if (infeasibility) {
     3958      assert (infeasibility>0);
    39603959      numberUnsatisfied++;
    39613960      sumUnsatisfied += infeasibility;
     
    51815180    int preferredWay ;
    51825181    int numberUnsatisfied = 0 ;
    5183     double integerTolerance = getIntegerTolerance() ;
    5184 
    51855182    memcpy(currentSolution_,solver_->getColSolution(),
    51865183           numberColumns*sizeof(double)) ;
     
    51895186    { double infeasibility =
    51905187          object_[iObject]->infeasibility(preferredWay) ;
    5191       if (infeasibility > integerTolerance) numberUnsatisfied++ ; }
     5188      if (infeasibility) numberUnsatisfied++ ; }
    51925189    if (numberUnsatisfied)
    51935190    { feasible = solveWithCuts(cuts,maximumCutPassesAtRoot_,
  • trunk/CbcNode.cpp

    r49 r78  
    938938    */
    939939    int iSmallest = 0;
    940     double mostAway = integerTolerance;
     940    double mostAway = 1.0e-100;
    941941    for (i = 0 ; i < maximumStrong ; i++) choice[i].possibleBranch = NULL ;
    942942    numberStrong=0;
     
    992992        }
    993993      }
    994       if (infeasibility>integerTolerance) {
     994      if (infeasibility) {
     995        //if (infeasibility<=integerTolerance)
     996          //printf("XXXXX small %g\n",infeasibility);
    995997        // Increase estimated degradation to solution
    996998        estimatedDegradation += CoinMin(object->upEstimate(),object->downEstimate());
     
    10061008          }
    10071009          bestPriority = priorityLevel;
    1008           mostAway=integerTolerance;
     1010          mostAway=1.0e-100;
    10091011          numberStrong=0;
    10101012        } else if (priorityLevel>bestPriority) {
Note: See TracChangeset for help on using the changeset viewer.