Ignore:
Timestamp:
Apr 1, 2013 1:09:22 PM (6 years ago)
Author:
forrest
Message:

make it easier to use slow exotic cuts
more on cutoff as constraint and multiple root solver fixes
general fixing of bugs found on MIQP etc

File:
1 edited

Legend:

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

    r1864 r1880  
    470470    }
    471471    randomNumberGenerator_.setSeed(value);
     472}
     473// Get seed
     474int
     475CbcHeuristic::getSeed() const
     476{
     477  return randomNumberGenerator_.getSeed();
    472478}
    473479
     
    648654    // valueNow,numberRowsNow,numberColumnsNow,
    649655    // valueStart,numberRowsStart,numberColumnsStart);
    650     if (10*numberRowsNow < 8*numberRowsStart)
     656    if (10*numberRowsNow < 8*numberRowsStart || 10*numberColumnsNow < 7*numberColumnsStart)
    651657        return valueNow / valueStart;
    652658    else if (10*numberRowsNow < 9*numberRowsStart)
     
    826832                    }
    827833                }
    828             } else if (ratio > fractionSmall && after > 300) {
     834            } else if (ratio > fractionSmall && after > 300 && numberNodes >=0) {
    829835                returnCode = -1;
    830836            }
Note: See TracChangeset for help on using the changeset viewer.