Changeset 426


Ignore:
Timestamp:
Sep 8, 2004 10:01:53 AM (15 years ago)
Author:
forrest
Message:

correcting errors

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpMatrixBase.cpp

    r401 r426  
    407407  int logLevel = model->messageHandler()->logLevel();
    408408  int numberInfeasible=0;
    409   const double * rowLower = model->rowLower();
    410   const double * rowUpper = model->rowUpper();
     409  const double * rowLower = model->lowerRegion(0);
     410  const double * rowUpper = model->upperRegion(0);
    411411  const double * solution;
    412412  solution = model->solutionRegion(0);
     
    429429    }
    430430  }
    431   const double * columnLower = model->columnLower();
    432   const double * columnUpper = model->columnUpper();
     431  const double * columnLower = model->lowerRegion(1);
     432  const double * columnUpper = model->upperRegion(1);
    433433  solution = model->solutionRegion(1);
    434434  for (iColumn=0;iColumn<numberColumns;iColumn++) {
  • trunk/ClpPackedMatrix.cpp

    r399 r426  
    227227             j<columnStart[iColumn]+columnLength[iColumn];j++) {
    228228          iRow=row[j];
    229           y[iRow] += value*elementByColumn[j];
    230         }
    231       }
    232     }
    233     int numberRows = getNumRows();
    234     for (iRow=0;iRow<numberRows;iRow++) {
    235       y[iRow] *= rowScale[iRow];
     229          y[iRow] += value*elementByColumn[j]*rowScale[iRow];
     230        }
     231      }
    236232    }
    237233  } else {
Note: See TracChangeset for help on using the changeset viewer.