Changeset 2370


Ignore:
Timestamp:
Nov 12, 2018 8:56:43 AM (2 months ago)
Author:
forrest
Message:

fix zero row problem and null factorization

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r2326 r2370  
    41194119     if ((what == 63 && !pivotVariable_) || (newArrays && !keepPivots)) {
    41204120          delete [] pivotVariable_;
    4121           pivotVariable_ = new int[numberRows2];
    4122           for (int i = 0; i < numberRows2; i++)
     4121          pivotVariable_ = new int[numberRows2+1];
     4122          for (int i = 0; i < numberRows2+1; i++)
    41234123               pivotVariable_[i] = -1;
    41244124     } else if (what == 63 && !keepPivots) {
  • trunk/Clp/src/OsiClp/OsiClpSolverInterface.cpp

    r2332 r2370  
    21122112      assert (factorization!=NULL || small->problemStatus_ );
    21132113      factorization_ = factorization;
     2114      if (factorization_ == NULL)
     2115        factorization_ = static_cast<ClpSimplexDual *>(small)->setupForStrongBranching(spareArrays_,numberRows,numberColumns,false);
    21142116#endif
    21152117    } else {
     
    74757477      if (otherInformation!=NULL) {
    74767478        int * array = static_cast<int *> (otherInformation);
    7477         if (array[0]>=0||array[0]<=2)
     7479        if (array[0]>=0&&array[0]<=2)
    74787480          specialOptions_ |= array[0]<<10;
    74797481      }
Note: See TracChangeset for help on using the changeset viewer.