Changeset 1865 for trunk


Ignore:
Timestamp:
Jun 28, 2012 6:28:34 AM (7 years ago)
Author:
forrest
Message:

do a better job of checking for gaps

File:
1 edited

Legend:

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

    r1836 r1865  
    40874087                         printf("Out of range %d %lld %d %g\n", iColumn, j, row[j], elementByColumn[j]);
    40884088#endif
     4089                         delete [] mark;
    40894090                         return false;
    40904091                    }
     
    48354836          if (matrix_->isColOrdered() && numberOther > matrix_->getNumCols())
    48364837               matrix_->setDimensions(-1, numberOther);
    4837           if (!matrix_->isColOrdered() || numberOther >= 0 || matrix_->getExtraGap()) {
     4838          if (!matrix_->isColOrdered() || numberOther >= 0 || matrix_->getExtraGap() || matrix_->hasGaps()) {
    48384839               numberErrors = matrix_->appendRows(number, starts, index, element, numberOther);
    48394840          } else {
Note: See TracChangeset for help on using the changeset viewer.