Changeset 1513 for stable


Ignore:
Timestamp:
Feb 9, 2010 11:12:10 AM (10 years ago)
Author:
forrest
Message:

fix for assert

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/1.11/Clp/src/Idiot.cpp

    r1508 r1513  
    211211        rowSave += (colsol[iCol]-lower[iCol])*element[j];
    212212        colsol[iCol]=lower[iCol];
    213         assert (lower[iCol]>-1.0e20);
    214213        while (nextSlack[iCol]>=0) {
    215214          iCol = nextSlack[iCol];
     215          double lowerValue = CoinMax(CoinMin(colsol[iCol],0.0)-1000.0,lower[iCol]);
    216216          j=columnStart[iCol];
    217           rowSave += (colsol[iCol]-lower[iCol])*element[j];
    218           colsol[iCol]=lower[iCol];
     217          rowSave += (colsol[iCol]-lowerValue)*element[j];
     218          colsol[iCol]=lowerValue;
    219219        }
    220220        iCol =negSlack[i];
     
    13211321    int * negSlack = posSlack+nrows;
    13221322    int * nextSlack = negSlack + nrows;
    1323 #if 1
     1323    /* Laci - try both ways - to see what works -
     1324       you can change second part as much as you want */
     1325#ifndef LACI_TRY
    13241326    // Array for sorting out slack values
    13251327    double * ratio = new double [ncols];
Note: See TracChangeset for help on using the changeset viewer.