Changeset 62


Ignore:
Timestamp:
Feb 18, 2005 1:42:27 PM (17 years ago)
Author:
forrest
Message:

minor stuff

Location:
trunk/Samples
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Samples/CbcHeuristicUser.cpp

    r21 r62  
    242242
    243243    double value=newSolution[iColumn];
     244    if (value<originalLower[i]) {
     245      value=originalLower[i];
     246      newSolution[i]=value;
     247    } else if (value>originalUpper[i]) {
     248      value=originalUpper[i];
     249      newSolution[i]=value;
     250    }
    244251    double nearest=floor(value+0.5);
    245252    assert(fabs(value-nearest)<10.0*primalTolerance);
  • trunk/Samples/CbcHeuristicUserB.cpp

    r15 r62  
    1313#include "CbcModel.hpp"
    1414#include "CbcMessage.hpp"
    15 #include "CbcHeuristicUserB.hpp"
     15#include "CbcHeuristicUser.hpp"
    1616#include "CbcBranchActual.hpp"
    1717#include "CbcCutGenerator.hpp"
     
    237237
    238238    double value=newSolution[iColumn];
     239    if (value<originalLower[i]) {
     240      value=originalLower[i];
     241      newSolution[i]=value;
     242    } else if (value>originalUpper[i]) {
     243      value=originalUpper[i];
     244      newSolution[i]=value;
     245    }
    239246    double nearest=floor(value+0.5);
    240247    assert(fabs(value-nearest)<10.0*primalTolerance);
Note: See TracChangeset for help on using the changeset viewer.