Ignore:
Timestamp:
Jul 10, 2007 11:18:14 AM (14 years ago)
Author:
forrest
Message:

take out misleading setting of integer variables because of ampl

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcSolver.cpp

    r678 r679  
    14761476      solver->setObjSense(info.direction);
    14771477      solver->setDblParam(OsiObjOffset,info.offset);
    1478       // Set integer variables
    1479       for (int i=info.numberColumns-info.numberIntegers;
    1480            i<info.numberColumns;i++)
    1481         solver->setInteger(i);
     1478      // Set integer variables (unless nonlinear when set)
     1479      if (!info.nonLinear) {
     1480        for (int i=info.numberColumns-info.numberIntegers;
     1481             i<info.numberColumns;i++)
     1482          solver->setInteger(i);
     1483      }
    14821484      goodModel=true;
    14831485      // change argc etc
Note: See TracChangeset for help on using the changeset viewer.