Changeset 1864 for stable


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

do a better job of checking for gaps (and change a message)

Location:
stable/1.14/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.14/Clp/src/CbcOrClpParam.cpp

    r1855 r1864  
    33223322          "For making equality cliques this is minimumsize.  Also for adding \
    33233323integer slacks.  May be used for more later \
    3324 If <1000 that is what it does.  If <1000000 - numberPasses is (value/1000)-1 and tune is tune %1000. \
     3324If <10000 that is what it does.  If <1000000 - numberPasses is (value/10000)-1 and tune is tune %10000. \
    33253325If >= 1000000! - numberPasses is (value/1000000)-1 and tune is tune %1000000.  In this case if tune is now still >=10000 \
    33263326numberPassesPerInnerLoop is changed from 10 to (tune-10000)-1 and tune becomes tune % 10000!!!!! - happy? - \
  • stable/1.14/Clp/src/ClpPackedMatrix.cpp

    r1753 r1864  
    40784078                         printf("Out of range %d %lld %d %g\n", iColumn, j, row[j], elementByColumn[j]);
    40794079#endif
     4080                         delete [] mark;
    40804081                         return false;
    40814082                    }
     
    48264827          if (matrix_->isColOrdered() && numberOther > matrix_->getNumCols())
    48274828               matrix_->setDimensions(-1, numberOther);
    4828           if (!matrix_->isColOrdered() || numberOther >= 0 || matrix_->getExtraGap()) {
     4829          if (!matrix_->isColOrdered() || numberOther >= 0 || matrix_->getExtraGap() || matrix_->hasGaps()) {
    48294830               numberErrors = matrix_->appendRows(number, starts, index, element, numberOther);
    48304831          } else {
Note: See TracChangeset for help on using the changeset viewer.