Changeset 1898 for trunk/Cbc/src


Ignore:
Timestamp:
Apr 9, 2013 2:06:04 PM (6 years ago)
Author:
stefan
Message:

fixup examples

Location:
trunk/Cbc/src
Files:
4 edited

Legend:

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

    r1886 r1898  
    22662266COINLIBAPI void  COINLINKAGE
    22672267Cbc_addSOS_Dense(Cbc_Model * model, int numObjects, const int * len,
    2268                  const int ** which, const double * weights, const int type)
     2268                 const int * const* which, const double * weights, const int type)
    22692269{
    22702270    const char prefix[] = "Cbc_C_Interface::Cbc_addSOS_Dense(): ";
  • trunk/Cbc/src/Cbc_C_Interface.h

    r1600 r1898  
    629629    COINLIBAPI void  COINLINKAGE
    630630    Cbc_addSOS_Dense(Cbc_Model * model, int numObjects, const int * len,
    631                      const int ** which, const double * weights, const int type)
     631                     const int * const * which, const double * weights, const int type)
    632632    ;
    633633    /** Add SOS constraints to the model using row-order matrix */
  • trunk/Cbc/src/Makefile.am

    r1840 r1898  
    193193        CbcBranchDynamic.hpp \
    194194        CbcBranchCut.hpp \
    195         CbcBranchDecision.hpp \
     195        CbcBranchDecision.hpp \
    196196        CbcBranchDefaultDecision.hpp \
    197197        CbcBranchingObject.hpp \
     
    214214        CbcFathom.hpp \
    215215        CbcEventHandler.hpp \
     216        CbcFathomDynamicProgramming.hpp \
    216217        CbcFeasibilityBase.hpp \
    217218        CbcFixVariable.hpp \
  • trunk/Cbc/src/Makefile.in

    r1840 r1898  
    653653        CbcBranchDynamic.hpp \
    654654        CbcBranchCut.hpp \
    655         CbcBranchDecision.hpp \
     655        CbcBranchDecision.hpp \
    656656        CbcBranchDefaultDecision.hpp \
    657657        CbcBranchingObject.hpp \
     
    674674        CbcFathom.hpp \
    675675        CbcEventHandler.hpp \
     676        CbcFathomDynamicProgramming.hpp \
    676677        CbcFeasibilityBase.hpp \
    677678        CbcFixVariable.hpp \
Note: See TracChangeset for help on using the changeset viewer.