Changeset 1116


Ignore:
Timestamp:
Jan 9, 2009 6:54:58 AM (11 years ago)
Author:
forrest
Message:

fix printing in fpump

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcHeuristicFPump.cpp

    r1115 r1116  
    888888          }     
    889889        }
     890        int numberIterations=0;
    890891        if (!doGeneral) {
    891892          // faster to do from all slack!!!!
     
    11561157          upper = solver->getColUpper();
    11571158          solution = solver->getColSolution();
     1159          numberIterations = solver->getIterationCount();
    11581160        } else {
    11591161          int * addStart = new int[2*general+1];
     
    12301232          if (nAdd) {
    12311233            solver->setColSolution(solver2->getColSolution());
     1234            numberIterations = solver2->getIterationCount();
    12321235            delete solver2;
     1236          } else {
     1237            numberIterations = solver->getIterationCount();
    12331238          }
    12341239          lower = solver->getColLower();
     
    12611266          }
    12621267        }
    1263         totalNumberIterations += solver->getIterationCount();
     1268        totalNumberIterations += numberIterations;
    12641269        if (solver->getNumRows()<3000)
    12651270          sprintf(pumpPrint,"Pass %3d: suminf. %10.5f (%d) obj. %g iterations %d",
    12661271                  numberPasses+totalNumberPasses,
    12671272                  newSumInfeas,newNumberInfeas,
    1268                   newTrueSolutionValue,solver->getIterationCount());
     1273                  newTrueSolutionValue,numberIterations);
    12691274        else
    12701275          sprintf(pumpPrint,"Pass %3d: (%.2f seconds) suminf. %10.5f (%d) obj. %g iterations %d", numberPasses+totalNumberPasses,
    12711276                  model_->getCurrentSeconds(),newSumInfeas,newNumberInfeas,
    1272                   newTrueSolutionValue,solver->getIterationCount());
     1277                  newTrueSolutionValue,numberIterations);
    12731278        model_->messageHandler()->message(CBC_FPUMP1,model_->messages())
    12741279          << pumpPrint
Note: See TracChangeset for help on using the changeset viewer.