Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc/src/CbcCompareDefault.cpp

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Revision
    r1573 r1902  
    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;
     
    172180            } else {
    173181                assert (depthX != depthY) ;
    174                 return depthX > depthY;
     182                return depthX < depthY;
    175183            }
    176184        }
Note: See TracChangeset for help on using the changeset viewer.