Ignore:
Timestamp:
Mar 16, 2009 6:25:57 AM (11 years ago)
Author:
forrest
Message:

changes to simplex and lots of stuff and start Mumps cholesky

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpPresolve.cpp

    r1321 r1344  
    1515#include "ClpPackedMatrix.hpp"
    1616#include "ClpSimplex.hpp"
     17#include "ClpSimplexOther.hpp"
    1718#ifndef SLIM_CLP
    1819#include "ClpQuadraticObjective.hpp"
     
    272273  originalModel_->times(1.0,originalModel_->primalColumnSolution(),
    273274                        originalModel_->primalRowSolution());
    274   originalModel_->checkSolutionInternal();
     275  originalModel_->checkSolutionInternal(); 
     276  if (originalModel_->sumDualInfeasibilities()>1.0e-1) {
     277    // See if we can fix easily
     278    static_cast<ClpSimplexOther *> (originalModel_)->cleanupAfterPostsolve();
     279  }
    275280  // Messages
    276281  presolvedModel_->messageHandler()->message(COIN_PRESOLVE_POSTSOLVE,
     
    850855    int i;
    851856    for (i=0;i<prob.nrows_;i++) {
    852       if ((prob.rowstat_[i]&7)==1)
     857      if ((prob.rowstat_[i]&7)==1) {
    853858        nr++;
     859      } else if ((prob.rowstat_[i]&7)==2) {
     860        // at ub
     861        assert (prob.acts_[i]>prob.rup_[i]-1.0e-6);
     862      } else if ((prob.rowstat_[i]&7)==3) {
     863        // at lb
     864        assert (prob.acts_[i]<prob.rlo_[i]+1.0e-6);
     865      }
    854866    }
    855867    int nc=0;
Note: See TracChangeset for help on using the changeset viewer.