Changeset 1826


Ignore:
Timestamp:
Nov 20, 2011 12:44:32 PM (8 years ago)
Author:
forrest
Message:

minor changes to fix minor bug

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r1825 r1826  
    16361636    assert (!rowObjective_);
    16371637    unsigned char * status2 = status_ + numberColumns_;
     1638    unsigned char * status2a = status_ + newNumberColumns;
    16381639    for (int i=0;i<numberRows;i++) {
    16391640      int iRow=whichRows[i];
     
    16481649        rowUpper_[newNumberRows] = rowUpper_[i];
    16491650        if (doStatus)
    1650           status2[newNumberRows] = status2[i];
     1651          status2a[newNumberRows] = status2[i];
    16511652        backRows[i]=newNumberRows++;
    16521653      }
  • trunk/Clp/src/ClpSimplexOther.cpp

    r1825 r1826  
    81698169    numberRowsLook=0;
    81708170    for (int iLook=0;iLook<numberColumnsLook;iLook++) {
     8171#if DEBUG_SOME>0
     8172#ifndef NDEBUG
     8173      checkBasis(newModel, rowType, columnType);
     8174#endif
     8175#endif
    81718176      nChanged++;
    81728177      int iColumn = whichColumns[iLook];
     
    82858290                 getColumnStatus(iColumn),jRowLower,jRowUpper,nActions);
    82868291#endif
    8287           if (newModel->getRowStatus(iRow)!=basic)
     8292          if (newModel->getRowStatus(iRow)!=basic) {
     8293            //newModel->setRowStatus(iRow,basic);
    82888294            numberNonBasicSlacksOut++;
     8295          }
    82898296          rowType[iRow]=1;
    82908297          if (iRow!=jRowLower&&iRow!=jRowUpper) {
     
    83678374      }
    83688375      columnLength[iColumn]=length;
     8376      //#define NO_MOVABLE
     8377#ifdef NO_MOVABLE
     8378      iFlag=-1;
     8379#endif
    83698380      if (iFlag>0&&nonFree) {
    83708381        double newValue;
Note: See TracChangeset for help on using the changeset viewer.