Ignore:
Timestamp:
Oct 8, 2006 7:33:47 PM (13 years ago)
Author:
forrest
Message:

towards common use with other solvers

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcCompareActual.cpp

    r424 r439  
    219219  }
    220220#else
    221   if (weight_==-1.0&&(y->depth()>7||x->depth()>7)) {
     221  if ((weight_==-1.0&&(y->depth()>7||x->depth()>7))||weight_==-3.0) {
     222    int adjust =  (weight_==-3.0) ? 10000 : 0;
    222223    // before solution
    223     /* printf("x %d %d %g, y %d %d %g\n",
     224    /*printf("x %d %d %g, y %d %d %g\n",
    224225       x->numberUnsatisfied(),x->depth(),x->objectiveValue(),
    225226       y->numberUnsatisfied(),y->depth(),y->objectiveValue()); */
    226     if (x->numberUnsatisfied() > y->numberUnsatisfied()) {
     227    if (x->numberUnsatisfied() > y->numberUnsatisfied()+adjust) {
    227228      return true;
    228     } else if (x->numberUnsatisfied() < y->numberUnsatisfied()) {
     229    } else if (x->numberUnsatisfied() < y->numberUnsatisfied()-adjust) {
    229230      return false;
    230231    } else {
Note: See TracChangeset for help on using the changeset viewer.