Changeset 754 for branches


Ignore:
Timestamp:
Aug 15, 2007 11:59:52 AM (12 years ago)
Author:
jpfasano
Message:

Modified to avoid MS compiler messages:
..\..\..\src\CbcSolver?.cpp(2314) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
..\..\..\src\CbcSolver?.cpp(2318) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
..\..\..\src\CbcSolver?.cpp(2321) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
..\..\..\src\CbcSolver?.cpp(2349) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
..\..\..\src\CbcSolver?.cpp(2350) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
..\..\..\src\CbcSolver?.cpp(2351) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
..\..\..\src\CbcSolver?.cpp(2353) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
..\..\..\src\CbcSolver?.cpp(2362) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
..\..\..\src\CbcSolver?.cpp(2366) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
..\..\..\src\CbcSolver?.cpp(2370) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/BSP/trunk/Cbc/src/CbcSolver.cpp

    r742 r754  
    23122312            case ROUNDING:
    23132313              defaultSettings=false; // user knows what she is doing
    2314               useRounding = action;
     2314              useRounding = (action!=0);
    23152315              break;
    23162316            case FPUMP:
    23172317              defaultSettings=false; // user knows what she is doing
    2318               useFpump=action;
     2318              useFpump=(action!=0);
    23192319              break;
    23202320            case RINS:
    2321               useRINS=action;
     2321              useRINS=(action!=0);
    23222322              break;
    23232323            case CUTSSTRATEGY:
    … …  
    23472347              break;
    23482348            case HEURISTICSTRATEGY:
    2349               useRounding = action;
    2350               useGreedy = action;
    2351               useCombine = action;
     2349              useRounding = (action!=0);
     2350              useGreedy = (action!=0);
     2351              useCombine = (action!=0);
    23522352              //useLocalTree = action;
    2353               useFpump=action;
     2353              useFpump=(action!=0);
    23542354              parameters[whichParam(ROUNDING,numberParameters,parameters)].setCurrentOption(action);
    23552355              parameters[whichParam(GREEDY,numberParameters,parameters)].setCurrentOption(action);
    … …  
    23602360            case GREEDY:
    23612361              defaultSettings=false; // user knows what she is doing
    2362               useGreedy = action;
     2362              useGreedy = (action!=0);
    23632363              break;
    23642364            case COMBINE:
    23652365              defaultSettings=false; // user knows what she is doing
    2366               useCombine = action;
     2366              useCombine = (action!=0);
    23672367              break;
    23682368            case LOCALTREE:
    23692369              defaultSettings=false; // user knows what she is doing
    2370               useLocalTree = action;
     2370              useLocalTree = (action!=0);
    23712371              break;
    23722372            case COSTSTRATEGY:
Note: See TracChangeset for help on using the changeset viewer.