Changeset 1059


Ignore:
Timestamp:
Feb 1, 2014 9:05:32 AM (6 years ago)
Author:
pbelotti
Message:

Timo's changes (bounds by problem_ should not be fixed)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/heuristics/CouenneFPscipSolve.cpp

    r1058 r1059  
    158158
    159159      if (problem_ -> Var (j) -> isInteger () &&
    160           problem_ -> Var (j) -> Multiplicity () > 0 &&
    161           problem_ -> Ub  (j) - problem_ -> Lb (j) > .5) {
     160          (problem_ -> Var (j) -> Multiplicity () > 0) &&
     161          (fabs (ubs [j] - lbs [j]) > .5)) {
     162        // problem_ -> Ub  (j) - problem_ -> Lb (j) > .5) {
    162163
    163164        // if (fabs (x [j] - floor (x [j] + .5)) >= SCIPfeastol (scip)) {
     
    173174        double x_rounded = floor (x [j] + .5);
    174175
    175         if        (x [j] >= problem_ -> Ub (j) - COUENNE_EPS) {
     176        if        (x [j] >= ubs [j] - COUENNE_EPS) {
    176177
    177178          tabuvars       [nEntries]   = vars [j];
     
    179180          tabuboundtypes [nEntries++] = SCIP_BOUNDTYPE_UPPER;
    180181
    181         } else if (x [j] <= problem_ -> Lb (j) + COUENNE_EPS) {
     182        } else if (x [j] <= lbs [j] + COUENNE_EPS) {
    182183
    183184          tabuvars       [nEntries]   = vars [j];
Note: See TracChangeset for help on using the changeset viewer.