Changeset 284


Ignore:
Timestamp:
Dec 24, 2003 11:16:07 AM (16 years ago)
Author:
jpfasano
Message:

Modified to compile with MS Visual Studio Version 6

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpCholeskyDense.cpp

    r275 r284  
    205205    if (!rowsDropped_[iColumn]) {
    206206      double value = region[iColumn];
    207       for (int iRow=0;iRow<iColumn;iRow++)
     207          int iRow;
     208      for (iRow=0;iRow<iColumn;iRow++)
    208209        value -= region[iRow]*work_[iColumn+iRow*numberRows_];
    209       for (int iRow=0;iRow<iColumn;iRow++)
     210      for (iRow=0;iRow<iColumn;iRow++)
    210211        if (rowsDropped_[iRow])
    211212          assert(!work_[iColumn+iRow*numberRows_]||!region[iRow]);
     
    222223      for (int iRow=iColumn+1;iRow<numberRows_;iRow++)
    223224        value -= region[iRow]*work[iRow];
    224       for (int iRow=iColumn+1;iRow<numberRows_;iRow++)
     225      for (iRow=iColumn+1;iRow<numberRows_;iRow++)
    225226        if (rowsDropped_[iRow])
    226227          assert(!work[iRow]||!region[iRow]);
  • trunk/ClpCholeskyWssmp.cpp

    r275 r284  
    331331  largest = min (largest2,1.0e-11);
    332332  int numberDroppedBefore=0;
    333   for (int iRow=0;iRow<numberRows_;iRow++) {
     333  for (iRow=0;iRow<numberRows_;iRow++) {
    334334    int dropped=rowsDropped_[iRow];
    335335    // Move to int array
  • trunk/ClpHelperFunctions.cpp

    r275 r284  
    1919  double maxValue=0.0;
    2020  for (i=0;i<size;i++)
    21     maxValue = std::max(maxValue,fabs(region[i]));
     21    maxValue = CoinMax(maxValue,fabs(region[i]));
    2222  return maxValue;
    2323}
     
    108108  for (i=0;i<size;i++) {
    109109    norm2 += region[i]*region[i];
    110     norm1 = std::max(norm1,fabs(region[i]));
     110    norm1 = CoinMax(norm1,fabs(region[i]));
    111111  }
    112112}
  • trunk/ClpPackedMatrix.cpp

    r282 r284  
    14581458#ifndef COIN_BIG_INDEX
    14591459        printf("Out of range %d %d %d %g\n",iColumn,j,row[j],elementByColumn[j]);
     1460#elif COIN_BIG_INDEX==1
     1461        printf("Out of range %d %ld %d %g\n",iColumn,j,row[j],elementByColumn[j]);
    14601462#else
    1461         printf("Out of range %d %ld %d %g\n",iColumn,j,row[j],elementByColumn[j]);
     1463        printf("Out of range %d %lld %d %g\n",iColumn,j,row[j],elementByColumn[j]);
    14621464#endif
    14631465        return false;
Note: See TracChangeset for help on using the changeset viewer.