Ignore:
Timestamp:
Mar 16, 2009 6:30:25 AM (11 years ago)
Author:
forrest
Message:

chnages to try and make faster

File:
1 edited

Legend:

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

    r1130 r1132  
    17831783  double value=0.0;
    17841784  if (!bestObject_) {
    1785     bestCriterion_=-1.0;
     1785    bestCriterion_=-1.0e30;
    17861786    bestNumberUp_=COIN_INT_MAX;
    17871787    bestNumberDown_=COIN_INT_MAX;
     
    17891789  // maybe branch up more if no solution or not many nodes done?
    17901790  if (stateOfSearch<=2) {
    1791 //#define TRY_STUFF 1
     1791    //#define TRY_STUFF 1
    17921792#ifdef TRY_STUFF
    17931793    // before solution - choose smallest number
     
    18501850    changeDown += perInf * numInfDown;
    18511851    changeUp += perInf * numInfUp;
     1852#if 0
     1853    if (numInfDown==1) {
     1854      if (numInfUp==1) {
     1855        changeUp += 1.0e6;
     1856        changeDown += 1.0e6;
     1857      } else if (changeDown<=1.5*changeUp) {
     1858        changeUp += 1.0e6;
     1859      }
     1860    } else if (numInfUp==1&&changeUp<=1.5*changeDown) {
     1861      changeDown += 1.0e6;
     1862    }
     1863#endif
    18521864#endif
    18531865    double minValue = CoinMin(changeDown,changeUp);
Note: See TracChangeset for help on using the changeset viewer.