Changeset 732 for branches


Ignore:
Timestamp:
Aug 9, 2007 1:36:41 PM (12 years ago)
Author:
jpfasano
Message:

Modified to remove a few MS Compiler messages

warning C4800: 'double'/'int' : forcing value to bool 'true' or 'false' (performance warning)

Location:
branches/BSP/trunk/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/BSP/trunk/Cbc/src/CbcHeuristic.cpp

    r724 r732  
    667667      lastChange=0;
    668668      for (iColumn=0;iColumn<numberColumns;iColumn++) {
    669         bool isInteger = integerType[iColumn];
     669        bool isInteger = (integerType[iColumn]!=0);
    670670        double currentValue = newSolution[iColumn];
    671671        double lowerValue = lower[iColumn];
  • branches/BSP/trunk/Cbc/src/CbcModel.cpp

    r724 r732  
    82838283  // solve LP
    82848284  //solver_->writeMps("bad");
    8285   bool feasible = resolve(NULL,3);
     8285  bool feasible = (resolve(NULL,3)!=0);
    82868286
    82878287  CbcModel * newModel = NULL;
     
    83168316  status_ = 0;
    83178317  // solve LP
    8318   bool feasible = resolve(NULL,3);
     8318  bool feasible = (resolve(NULL,3)!=0);
    83198319
    83208320  bestObjective_=1.0e50;
     
    85118511        // just point to solver_
    85128512        continuousSolver_ = solver_;
    8513         feasible=resolve(NULL,3);
     8513        feasible=(resolve(NULL,3)!=0);
    85148514        if (!feasible||!doIntegerPresolve||weak) break;
    85158515        // see if we can get solution by heuristics
Note: See TracChangeset for help on using the changeset viewer.