Changeset 2166 for trunk


Ignore:
Timestamp:
Sep 6, 2015 5:02:39 AM (2 years ago)
Author:
forrest
Message:

improve singular

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r2078 r2166  
    417417  int solveMode = coinAbcFactorization_->solveMode()&1;
    418418  if (model->numberIterations()>model->baseIteration())
    419     solveMode += 8;
     419    solveMode |= 9;  // was +8 - this allows dense
    420420  else
    421421    solveMode = 1; // try dense
  • trunk/Clp/src/AbcSimplexPrimal.cpp

    r2078 r2166  
    962962    if (ifValuesPass&&numberIterations_==baseIteration_) {
    963963      double * save = new double[numberRows_];
    964       for (int iRow = 0; iRow < numberRows_; iRow++) {
    965         int iPivot = abcPivotVariable_[iRow];
    966         save[iRow] = abcSolution_[iPivot];
    967       }
    968964      int numberOut = 1;
    969965      while (numberOut) {
     966        for (int iRow = 0; iRow < numberRows_; iRow++) {
     967          int iPivot = abcPivotVariable_[iRow];
     968          save[iRow] = abcSolution_[iPivot];
     969        }
    970970        gutsOfPrimalSolution(2);
    971971        double badInfeasibility = abcNonLinearCost_->largestInfeasibility();
     
    990990          }
    991991          abcNonLinearCost_->checkInfeasibilities(primalTolerance_);
    992           printf("Largest infeasibility %g\n",abcNonLinearCost_->largestInfeasibility());
     992          if (handler_->logLevel()>1)
     993            printf("Largest infeasibility %g\n",abcNonLinearCost_->largestInfeasibility());
    993994          int numberBasic = 0;
    994995          for (int iRow = 0; iRow < numberRows_; iRow++) {
     
    10361037        }
    10371038        if (numberOut) {
     1039          double savePivotTolerance = abcFactorization_->pivotTolerance();
     1040          abcFactorization_->pivotTolerance(0.99);
    10381041          int factorStatus = internalFactorize(12);
     1042          abcFactorization_->pivotTolerance(savePivotTolerance);
    10391043          assert (!factorStatus);
    10401044        }
Note: See TracChangeset for help on using the changeset viewer.