Ignore:
Timestamp:
Apr 6, 2013 9:33:15 AM (7 years ago)
Author:
stefan
Message:

sync with trunk rev 1882

Location:
stable/2.8/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/src/CbcCompareDefault.cpp

    r1854 r1883  
    138138                return equalityTest(x, y); // so ties will be broken in consistent manner
    139139        }
     140    }
     141    if (!weight_) {
     142      double testX =  x->objectiveValue() + 1.0e-9 * x->numberUnsatisfied();
     143      double testY = y->objectiveValue() + 1.0e-9 * y->numberUnsatisfied();
     144      if (testX != testY)
     145        return testX > testY;
     146      else
     147        return equalityTest(x, y); // so ties will be broken in consistent manner
    140148    }
    141149    //weight_=0.0;
Note: See TracChangeset for help on using the changeset viewer.