Changeset 257


Ignore:
Timestamp:
Feb 17, 2006 2:09:15 PM (14 years ago)
Author:
forrest
Message:

correct stats

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcModel.cpp

    r249 r257  
    715715  numberFixedAtRoot_=0;
    716716  numberFixedNow_=0;
     717  int numberIterationsAtContinuous = numberIterations_;
    717718  if (feasible)
    718719  { newNode = new CbcNode ;
     
    15831584      averageSolutionDepth /= (double) numberSolutions;
    15841585    int numberSolved = numberNodes2_-numberCutoff;
    1585     double averageNumberIterations2=numberIterations_-averageNumberIterations1;
     1586    double averageNumberIterations2=numberIterations_-averageNumberIterations1
     1587      -numberIterationsAtContinuous;
    15861588    if(numberCutoff) {
    15871589      averageCutoffDepth /= (double) numberCutoff;
     
    19901992  numberFixedAtRoot_=0;
    19911993  numberFixedNow_=0;
     1994  int numberIterationsAtContinuous = numberIterations_;
    19921995  if (feasible)
    19931996  { newNode = new CbcNode ;
     
    24852488      averageSolutionDepth /= (double) numberSolutions;
    24862489    int numberSolved = numberNodes2_-numberCutoff;
    2487     double averageNumberIterations2=numberIterations_-averageNumberIterations1;
     2490    double averageNumberIterations2=numberIterations_-averageNumberIterations1
     2491      -numberIterationsAtContinuous;
    24882492    if(numberCutoff) {
    24892493      averageCutoffDepth /= (double) numberCutoff;
Note: See TracChangeset for help on using the changeset viewer.