Changeset 1394 for trunk/Clp


Ignore:
Timestamp:
Jul 9, 2009 10:05:23 AM (10 years ago)
Author:
forrest
Message:

allow infeasibilityray more and prepare

Location:
trunk/Clp/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpFactorization.hpp

    r1376 r1394  
    1414class CoinOtherFactorization;
    1515#ifndef CLP_MULTIPLE_FACTORIZATIONS
    16 #ifdef CLP_OSL
    1716#define CLP_MULTIPLE_FACTORIZATIONS 4
    18 #else
    19 #define CLP_MULTIPLE_FACTORIZATIONS 3
    20 #endif
    2117#endif   
    2218#ifdef CLP_MULTIPLE_FACTORIZATIONS
  • trunk/Clp/src/ClpModel.cpp

    r1370 r1394  
    25852585{
    25862586  double * array = NULL;
    2587   if (problemStatus_==1&&!secondaryStatus_) {
     2587  if (problemStatus_==1) {
    25882588    array = ClpCopyOfArray(ray_,numberRows_);
    2589     //#define SWAP_SIGN
    2590 #ifdef SWAP_SIGN
     2589#ifndef CLP_NO_SWAP_SIGN
    25912590    // swap signs to be consistent with norm
    25922591    for (int i=0;i<numberRows_;i++)
  • trunk/Clp/src/ClpPredictorCorrector.cpp

    r1370 r1394  
    31383138#define KILL_ITERATION 50
    31393139#else
     3140#if CLP_CAUTION < 1
     3141#define KILL_ITERATION 50
     3142#else
    31403143#define KILL_ITERATION 100
     3144#endif
    31413145#endif
    31423146  if (!quadraticObj||1) {
  • trunk/Clp/src/ClpSimplexDual.cpp

    r1376 r1394  
    44404440         sumDualInfeasibilities_,numberDualInfeasibilities_);
    44414441#endif   
     4442  double approximateObjective=objectiveValue_;
    44424443#ifdef CLP_REPORT_PROGRESS
    44434444    if (ixxxxxx>=ixxyyyy-4&&ixxxxxx<=ixxyyyy) {
     
    51205121  if (alphaAccuracy_>0.0)
    51215122      alphaAccuracy_=1.0;
     5123  // If we are stopping - use plausible objective
     5124  // Maybe only in fast dual
     5125  if (problemStatus_>2)
     5126    objectiveValue_ = approximateObjective;
    51225127}
    51235128/* While updateDualsInDual sees what effect is of flip
  • trunk/Clp/src/ClpSimplexPrimal.cpp

    r1376 r1394  
    821821    dummy=4;
    822822    matrix_->generalExpanded(this,9,dummy);
    823 #ifdef CLP_CAUTION
     823#ifndef CLP_CAUTION
     824#define CLP_CAUTION 1
     825#endif
     826#if CLP_CAUTION
    824827    double lastAverageInfeasibility=sumDualInfeasibilities_/
    825828      static_cast<double>(numberDualInfeasibilities_+10);
     
    828831    double sumInfeasibility =  nonLinearCost_->sumInfeasibilities();
    829832    int reason2=0;
    830 #ifdef CLP_CAUTION
     833#if CLP_CAUTION
    831834#if CLP_CAUTION==2
    832835    double test2=1.0e5;
Note: See TracChangeset for help on using the changeset viewer.