Changeset 52


Ignore:
Timestamp:
Nov 5, 2002 9:34:43 AM (17 years ago)
Author:
forrest
Message:

taking out MERGE

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpSimplexDual.cpp

    r50 r52  
    619619#endif
    620620
    621 #if 0 // *MERGE*
    622           if (factorization_->pivots()<5) {
    623             problemStatus_=-4; //say looks infeasible
    624             // create ray anyway
    625             delete [] ray_;
    626             ray_ = new double [ numberRows_];
    627             CoinDisjointCopyN(rowArray_[0]->denseVector(),numberRows_,ray_);
    628           }
    629           rowArray_[0]->clear();
    630           columnArray_[0]->clear();
    631 #else // devel-1
    632621        if (whatNext==1) {
    633622          problemStatus_ =-2; // refactorize
     
    636625          problemStatus_= 3;
    637626          returnCode=3;
    638 #endif
    639627          break;
    640628        }
     
    645633          printf("** no column pivot\n");
    646634#endif
    647 #if 0 // *MERGE*
    648         if (!factorization_->pivots()) {
    649           // may have crept through - so may be optimal
    650           //problemStatus_=-5; //say looks unbounded
    651           problemStatus_=0;
    652           // check any flagged variables
    653           int iRow;
    654           for (iRow=0;iRow<numberRows_;iRow++) {
    655             int iPivot=pivotVariable_[iRow];
    656             if (flagged(iPivot))
    657               break;
    658           }
    659           if (iRow<numberRows_) {
    660 #ifdef CLP_DEBUG
    661             std::cerr<<"Flagged variables at end - infeasible?"<<std::endl;
    662 #endif
    663             problemStatus_=-4; //say looks infeasible
    664             // create ray anyway
    665             delete [] ray_;
    666             ray_ = new double [ numberRows_];
    667             CoinDisjointCopyN(rowArray_[0]->denseVector(),numberRows_,ray_);
    668           }
    669 #else // devel-1
    670635        if (factorization_->pivots()<5) {
    671636          problemStatus_=-4; //say looks infeasible
     
    674639          ray_ = new double [ numberRows_];
    675640          ClpDisjointCopyN(rowArray_[0]->denseVector(),numberRows_,ray_);
    676 #endif
    677641        }
    678642        rowArray_[0]->clear();
  • trunk/ClpSimplexPrimal.cpp

    r50 r52  
    391391      }   
    392392    }     
    393 #endif
    394 #if 0 // *MERGE*
    395         if (nonLinearCost_->numberInfeasibilities())
    396           problemStatus_=-4; // might be infeasible
    397         break;
    398       }
    399     }
    400 #else // devel-1
    401393#endif
    402394#if CLP_DEBUG>2
     
    734726  // we may wish to say it is optimal even if infeasible
    735727  bool alwaysOptimal = (specialOptions_&1)!=0;
    736 #if 0 // *MERGE*
    737   if (dualFeasible()||problemStatus_==-4) {
    738 #else // devel-1
    739728  // give code benefit of doubt
    740729  if (sumOfRelaxedDualInfeasibilities_ == 0.0&&
     
    747736  }
    748737  if (dualFeasible()||problemStatus_==-4||(type==3&&problemStatus_!=-5)) {
    749 #endif
    750738    if (nonLinearCost_->numberInfeasibilities()&&!alwaysOptimal) {
    751739      //may need infeasiblity cost changed
  • trunk/Test/unitTest.cpp

    r50 r52  
    145145    objValue.push_back(5.5018458883E+03);
    146146
    147 #if 0 // *MERGE*
    148 #if 0
    149 #else // devel-1
    150 #if 1
    151147    mpsName.push_back("80bau3b");min.push_back(true);nRows.push_back(2263);nCols.push_back(9799);objValueTol.push_back(1.e-10);objValue.push_back(9.8722419241E+05);
    152 #endif
    153148    mpsName.push_back("blend");min.push_back(true);nRows.push_back(75);nCols.push_back(83);objValueTol.push_back(1.e-10);objValue.push_back(-3.0812149846e+01);
    154149    mpsName.push_back("pilotnov");min.push_back(true);nRows.push_back(976);nCols.push_back(2172);objValueTol.push_back(1.e-10);objValue.push_back(-4.4972761882e+03);
     
    190185    mpsName.push_back("ganges");min.push_back(true);nRows.push_back(1310);nCols.push_back(1681);objValueTol.push_back(1.e-5);objValue.push_back(-1.0958636356e+05);
    191186    mpsName.push_back("gfrd-pnc");min.push_back(true);nRows.push_back(617);nCols.push_back(1092);objValueTol.push_back(1.e-10);objValue.push_back(6.9022359995e+06);
    192 #endif
    193187    mpsName.push_back("greenbea");min.push_back(true);nRows.push_back(2393);nCols.push_back(5405);objValueTol.push_back(1.e-10);objValue.push_back(/*-7.2462405908e+07*/-72555248.129846);
    194188    mpsName.push_back("greenbeb");min.push_back(true);nRows.push_back(2393);nCols.push_back(5405);objValueTol.push_back(1.e-10);objValue.push_back(/*-4.3021476065e+06*/-4302260.2612066);
Note: See TracChangeset for help on using the changeset viewer.