Ignore:
Timestamp:
Apr 6, 2013 4:52:59 PM (6 years ago)
Author:
stefan
Message:

sync with trunk rev 1887

Location:
stable/2.8/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/src/CbcSolverExpandKnapsack.cpp

    r1854 r1888  
    552552   for (iKnapsack=0;iKnapsack<numberKnapsack;iKnapsack++) {
    553553      int k=-1;
    554       double value=0.0;
    555554      for (iColumn=knapsackStart[iKnapsack];iColumn<knapsackStart[iKnapsack+1];iColumn++) {
    556555         if (knapsackSolution[iColumn]>1.0e-5) {
     
    561560            }
    562561            k=iColumn;
    563             value=floor(knapsackSolution[iColumn]+0.5);
    564             assert (fabs(value-knapsackSolution[iColumn])<1.0e-5);
     562            assert (fabs(floor(knapsackSolution[iColumn]+0.5)-knapsackSolution[iColumn])<1.0e-5);
    565563         }
    566564      }
Note: See TracChangeset for help on using the changeset viewer.