Ignore:
Timestamp:
Jun 14, 2013 11:43:10 AM (7 years ago)
Author:
stefan
Message:

merge r1945, r1947, and r1950..r1958 from trunk

Location:
stable/1.15/Clp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp

  • stable/1.15/Clp/src

  • stable/1.15/Clp/src/ClpPredictorCorrector.cpp

    r1931 r1959  
    1515#include "CoinHelperFunctions.hpp"
    1616#include "ClpPredictorCorrector.hpp"
     17#include "ClpEventHandler.hpp"
    1718#include "CoinPackedMatrix.hpp"
    1819#include "ClpMessage.hpp"
     
    251252                    << cholesky_->rank()
    252253                    << CoinMessageEol;
     254          // Check event
     255          {
     256            int status = eventHandler_->event(ClpEventHandler::endOfIteration);
     257            if (status >= 0) {
     258              problemStatus_ = 5;
     259              secondaryStatus_ = ClpEventHandler::endOfIteration;
     260              break;
     261            }
     262          }
    253263#if 0
    254264          if (numberIterations_ == -1) {
Note: See TracChangeset for help on using the changeset viewer.