Changeset 2039 for trunk/Cbc/src


Ignore:
Timestamp:
Jun 19, 2014 10:34:45 PM (5 years ago)
Author:
mlubin
Message:

reenable SOS code

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/Cbc_C_Interface.cpp

    r2038 r2039  
    769769}
    770770/** Add SOS constraints to the model using row-order matrix */
    771 /*
     771
    772772COINLIBAPI void  COINLINKAGE
    773773Cbc_addSOS(Cbc_Model * model, int numRows, const int * rowStarts,
     
    851851    if (VERBOSE > 0) printf("%sreturn\n", prefix);
    852852    return;
    853 }*/
     853}
    854854
    855855/** Print the solution */
  • trunk/Cbc/src/Cbc_C_Interface.h

    r2038 r2039  
    207207    Cbc_setInteger(Cbc_Model * model, int iColumn)
    208208    ;
    209     /* Add SOS constraints to the model using row-order matrix
     209    /** Add SOS constraints to the model using row-order matrix
    210210     * Unable to confirm that this function is working. */
    211     /*COINLIBAPI void  COINLINKAGE
     211    COINLIBAPI void  COINLINKAGE
    212212    Cbc_addSOS(Cbc_Model * model, int numRows, const int * rowStarts,
    213213               const int * colIndices, const double * weights, const int type)
    214     ;*/
     214    ;
    215215    /** Print the model */
    216216    COINLIBAPI void COINLINKAGE
Note: See TracChangeset for help on using the changeset viewer.