Changeset 1466 for trunk/Cbc/src


Ignore:
Timestamp:
Jun 9, 2010 6:25:35 AM (9 years ago)
Author:
stefan
Message:

add (back) option to use SoPlex? as LP solver

Location:
trunk/Cbc/src
Files:
4 edited

Legend:

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

    r1464 r1466  
    6464#endif
    6565
     66#ifdef COIN_HAS_SPX
     67# include "OsiSpxSolverInterface.hpp"
     68# ifndef CBC_DEFAULT_SOLVER
     69#   define CBC_DEFAULT_SOLVER "spx"
     70# endif
     71#endif
     72
    6673#include "CoinParam.hpp"
    6774
     
    135142# ifdef COIN_HAS_MSK
    136143    solvers["msk"] = new OsiMskSolverInterface  ;
     144# endif
     145# ifdef COIN_HAS_SPX
     146    solvers["spx"] = new OsiSpxSolverInterface  ;
    137147# endif
    138148    /*
  • trunk/Cbc/src/Makefile.am

    r1464 r1466  
    210210endif
    211211
    212 # if COIN_HAS_SPX
    213 #   AM_CPPFLAGS += $(SPX_CFLAGS)
    214 #   cbc_generic_LDADD += $(SPX_LIBS)
    215 # endif
     212if COIN_HAS_SPX
     213  AM_CPPFLAGS += $(SPX_CFLAGS)
     214  cbc_generic_LDADD += $(SPX_LIBS)
     215endif
    216216
    217217if COIN_HAS_VOL
  • trunk/Cbc/src/Makefile.in

    r1464 r1466  
    8181@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__append_16 = $(MSK_CFLAGS)
    8282@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__append_17 = $(MSK_LIBS)
    83 
    84 # if COIN_HAS_SPX
    85 #   AM_CPPFLAGS += $(SPX_CFLAGS)
    86 #   cbc_generic_LDADD += $(SPX_LIBS)
    87 # endif
    88 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_18 = $(VOL_CFLAGS)
    89 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_19 = $(VOL_LIBS)
    90 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_20 = $(XPR_CFLAGS)
    91 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_21 = $(XPR_LIBS)
    92 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_22 = $(ASL_CFLAGS)
    93 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_23 = $(ASL_LIBS)
     83@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__append_18 = $(SPX_CFLAGS)
     84@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__append_19 = $(SPX_LIBS)
     85@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_20 = $(VOL_CFLAGS)
     86@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_21 = $(VOL_LIBS)
     87@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_22 = $(XPR_CFLAGS)
     88@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_23 = $(XPR_LIBS)
     89@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_24 = $(ASL_CFLAGS)
     90@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_25 = $(ASL_LIBS)
    9491subdir = src
    9592DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
     
    187184@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
    188185@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
    189 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
    190 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
    191 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
     186@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
     187@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
     188@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
     189@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
    192190@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_DEPENDENCIES =  \
    193191@CBC_BUILD_CBC_GENERIC_TRUE@    libCbcSolver.la libCbc.la \
     
    201199@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_9) \
    202200@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_10) \
    203 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_11)
     201@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_11) \
     202@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_12)
    204203depcomp = $(SHELL) $(top_srcdir)/../depcomp
    205204am__depfiles_maybe = depfiles
     
    295294COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
    296295COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
     296COIN_HAS_SPX_FALSE = @COIN_HAS_SPX_FALSE@
     297COIN_HAS_SPX_TRUE = @COIN_HAS_SPX_TRUE@
    297298COIN_HAS_VOL_FALSE = @COIN_HAS_VOL_FALSE@
    298299COIN_HAS_VOL_TRUE = @COIN_HAS_VOL_TRUE@
     
    378379OSICBC_DFLT_SOLVER_MSK_FALSE = @OSICBC_DFLT_SOLVER_MSK_FALSE@
    379380OSICBC_DFLT_SOLVER_MSK_TRUE = @OSICBC_DFLT_SOLVER_MSK_TRUE@
     381OSICBC_DFLT_SOLVER_SPX_FALSE = @OSICBC_DFLT_SOLVER_SPX_FALSE@
     382OSICBC_DFLT_SOLVER_SPX_TRUE = @OSICBC_DFLT_SOLVER_SPX_TRUE@
    380383OSICBC_DFLT_SOLVER_SYM_FALSE = @OSICBC_DFLT_SOLVER_SYM_FALSE@
    381384OSICBC_DFLT_SOLVER_SYM_TRUE = @OSICBC_DFLT_SOLVER_SYM_TRUE@
     
    403406SET_MAKE = @SET_MAKE@
    404407SHELL = @SHELL@
     408SPX_CFLAGS = @SPX_CFLAGS@
     409SPX_DATA = @SPX_DATA@
     410SPX_LIBS = @SPX_LIBS@
    405411STRIP = @STRIP@
    406412VERSION = @VERSION@
     
    578584        $(am__append_12) $(am__append_14) $(am__append_16) \
    579585        $(am__append_18) $(am__append_20) $(am__append_22) \
    580         -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
     586        $(am__append_24) -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
    581587
    582588# List all source files for this executable, including headers
     
    611617@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_15) $(am__append_17) \
    612618@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_19) $(am__append_21) \
    613 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_23)
     619@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_23) $(am__append_25)
    614620
    615621# Finally, the -rpath flag is used by libtool to make sure that the shared
  • trunk/Cbc/src/OsiCbc/Makefile.in

    r1464 r1466  
    162162COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
    163163COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
     164COIN_HAS_SPX_FALSE = @COIN_HAS_SPX_FALSE@
     165COIN_HAS_SPX_TRUE = @COIN_HAS_SPX_TRUE@
    164166COIN_HAS_VOL_FALSE = @COIN_HAS_VOL_FALSE@
    165167COIN_HAS_VOL_TRUE = @COIN_HAS_VOL_TRUE@
     
    245247OSICBC_DFLT_SOLVER_MSK_FALSE = @OSICBC_DFLT_SOLVER_MSK_FALSE@
    246248OSICBC_DFLT_SOLVER_MSK_TRUE = @OSICBC_DFLT_SOLVER_MSK_TRUE@
     249OSICBC_DFLT_SOLVER_SPX_FALSE = @OSICBC_DFLT_SOLVER_SPX_FALSE@
     250OSICBC_DFLT_SOLVER_SPX_TRUE = @OSICBC_DFLT_SOLVER_SPX_TRUE@
    247251OSICBC_DFLT_SOLVER_SYM_FALSE = @OSICBC_DFLT_SOLVER_SYM_FALSE@
    248252OSICBC_DFLT_SOLVER_SYM_TRUE = @OSICBC_DFLT_SOLVER_SYM_TRUE@
     
    270274SET_MAKE = @SET_MAKE@
    271275SHELL = @SHELL@
     276SPX_CFLAGS = @SPX_CFLAGS@
     277SPX_DATA = @SPX_DATA@
     278SPX_LIBS = @SPX_LIBS@
    272279STRIP = @STRIP@
    273280VERSION = @VERSION@
Note: See TracChangeset for help on using the changeset viewer.