Changeset 1959


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

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

Location:
stable/1.15/Clp
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp

  • stable/1.15/Clp/MSVisualStudio/v10/clp/clp.vcxproj

    r1922 r1959  
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2727    <ConfigurationType>Application</ConfigurationType>
    28     <PlatformToolset>v100</PlatformToolset>
    2928  </PropertyGroup>
    3029  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3130    <ConfigurationType>Application</ConfigurationType>
    32     <PlatformToolset>v90</PlatformToolset>
    3331  </PropertyGroup>
    3432  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     
    3735  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    3836    <ConfigurationType>Application</ConfigurationType>
    39     <PlatformToolset>v100</PlatformToolset>
    4037  </PropertyGroup>
    4138  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  • 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) {
  • stable/1.15/Clp/src/ClpSimplex.cpp

    r1949 r1959  
    33133313                    scalingFlag_ = -scalingFlag_; // not scaled after all
    33143314               if (rowScale_ && automaticScale_) {
     3315                    if (!savedRowScale_) {
     3316                      inverseRowScale_ = rowScale_ + numberRows2;
     3317                      inverseColumnScale_ = columnScale_ + numberColumns_;
     3318                    }
    33153319                    // try automatic scaling
    33163320                    double smallestObj = 1.0e100;
  • stable/1.15/Clp/src/ClpSolve.cpp

    r1931 r1959  
    544544                        bool interrupt)
    545545{
    546   if (!this->abcState()) {
     546  if (!this->abcState()||!numberRows_||!numberColumns_) {
    547547    if (!solveType)
    548548      this->dual(0);
     
    27682768          }
    27692769#ifdef BORROW
     2770          int saveNumberIterations = barrier.numberIterations();
    27702771          barrier.returnModel(*model2);
    27712772          double * rowPrimal = new double [numberRows];
     
    30093010          //model2->setMaximumIterations(saveMaxIts);
    30103011#ifdef BORROW
     3012          model2->setNumberIterations(model2->numberIterations()+saveNumberIterations);
    30113013          delete [] rowPrimal;
    30123014          delete [] columnPrimal;
Note: See TracChangeset for help on using the changeset viewer.