Changeset 1605 for trunk/Cbc/src


Ignore:
Timestamp:
Mar 3, 2011 11:21:46 AM (9 years ago)
Author:
forrest
Message:

minor modifications to avoid asserts on odd problem

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcModel.cpp

    r1590 r1605  
    1054810548                value = CoinMin(value, saveUpper[iColumn]) ;
    1054910549                if (solver_->isInteger(iColumn)) {
    10550                     assert(fabs(value - solution[iColumn]) <= integerTolerance) ;
     10550                    assert(fabs(value - solution[iColumn]) <= 100.0*integerTolerance) ;
    1055110551#if COIN_DEVELOP>1
    1055210552                    double value2 = floor(value + 0.5);
  • trunk/Cbc/src/CbcNode.cpp

    r1573 r1605  
    32553255                        solver->markHotStart();
    32563256                        // may be infeasible (if other way stopped on iterations)
    3257                         if (!solver->isProvenOptimal()) {
     3257                        if (!solver->isProvenOptimal()||solver->isDualObjectiveLimitReached()) {
    32583258                            // neither side feasible
    32593259                            anyAction = -2;
     
    32973297                        solver->markHotStart();
    32983298                        // may be infeasible (if other way stopped on iterations)
    3299                         if (!solver->isProvenOptimal()) {
     3299                        if (!solver->isProvenOptimal()||solver->isDualObjectiveLimitReached()) {
    33003300                            // neither side feasible
    33013301                            anyAction = -2;
Note: See TracChangeset for help on using the changeset viewer.