Changeset 1403 for stable


Ignore:
Timestamp:
Dec 15, 2009 7:01:29 AM (10 years ago)
Author:
forrest
Message:

fix message and increase a tolerance

Location:
stable/2.4/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.4/Cbc/src/CbcHeuristic.cpp

    r1271 r1403  
    22232223#ifndef NDEBUG
    22242224        double value=newSolution[iColumn];
    2225         assert (fabs(floor(value+0.5)-value)<integerTolerance);
     2225        assert (fabs(floor(value+0.5)-value)<10.0*integerTolerance+
     2226                1.0e-9*fabs(value));
    22262227#endif
    22272228        double cost = direction * objective[iColumn];
  • stable/2.4/Cbc/src/CbcSolver.cpp

    r1271 r1403  
    1040410404                    // unbounded
    1040510405                    fprintf(fp, "Unbounded" );
    10406                   } else if (iStat==3) {
    10407                     fprintf(fp, "Stopped on iterations or time" );
    10408                   } else if (iStat==4) {
    10409                     fprintf(fp, "Stopped on difficulties" );
    10410                   } else if (iStat==5) {
    10411                     fprintf(fp, "Stopped on ctrl-c" );
     10406                  } else if (iStat >= 3&&iStat <= 5) {
     10407                    if (iStat==3)
     10408                      fprintf(fp, "Stopped on iterations or time" );
     10409                    else if (iStat == 4)
     10410                      fprintf(fp, "Stopped on difficulties" );
     10411                    else 
     10412                      fprintf(fp, "Stopped on ctrl-c" );
     10413                    if (babModel_&&!babModel_->bestSolution())
     10414                      fprintf(fp," (no integer solution - continuous used)");
    1041210415                  } else if (iStat==6) {
    1041310416                    // bab infeasible
Note: See TracChangeset for help on using the changeset viewer.