Changeset 679


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

take out misleading setting of integer variables because of ampl

Location:
branches/devel/Cbc/src
Files:
3 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
  • branches/devel/Cbc/src/Cbc_ampl.cpp

    r642 r679  
    532532    }
    533533    info->numberIntegers=numberIntegers;
     534    // Say nonlinear if it is
     535    info->nonLinear=nlvc+nlvo;
    534536    if (numberIntegers>0) {
    535537      mip_stuff(); // get any extra info
  • branches/devel/Cbc/src/Cbc_ampl.h

    r587 r679  
    4242  char buffer[300];
    4343  int logLevel;
     44  int nonLinear;
    4445} ampl_info;
    4546#ifdef __cplusplus
Note: See TracChangeset for help on using the changeset viewer.