Ignore:
Timestamp:
May 8, 2014 1:41:51 PM (5 years ago)
Author:
mlubin
Message:

SOS updates and test (not yet working)

File:
1 edited

Legend:

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

    r2032 r2033  
    201201    Cbc_setInteger(Cbc_Model * model, int iColumn)
    202202    ;
    203     /** Add SOS constraints to the model using dense matrix */
    204     COINLIBAPI void  COINLINKAGE
    205     Cbc_addSOS_Dense(Cbc_Model * model, int numObjects, const int * len,
    206                      const int * const * which, const double * weights, const int type)
    207     ;
    208203    /** Add SOS constraints to the model using row-order matrix */
    209204    COINLIBAPI void  COINLINKAGE
    210     Cbc_addSOS_Sparse(Cbc_Model * model, const int * rowStarts,
    211                       const int * rowIndices, const double * weights, const int type)
     205    Cbc_addSOS(Cbc_Model * model, int numRows, const int * rowStarts,
     206               const int * colIndices, const double * weights, const int type)
    212207    ;
    213208    /** Print the model */
Note: See TracChangeset for help on using the changeset viewer.