Ignore:
Timestamp:
Jun 7, 2010 8:27:42 AM (11 years ago)
Author:
stefan
Message:

merge split branch into trunk; fix some examples

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:externals

      •  

        old new  
        1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
        2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
        6 Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        7 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        8 Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
        9 Clp               https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
        10 Osi               https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
        11 Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         6Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
         7#Data/miplib3      https://projects.coin-or.org/svn/Data/trunk/miplib3
         8CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         9Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
         10Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
         11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
         12#Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1437-1439,​1444-1448,​1463

  • trunk/Cbc

  • trunk/Cbc/test/Makefile.am

    r1052 r1464  
    1313########################################################################
    1414
    15 CBC_TEST_TGTS = gamstests
     15CBC_TEST_TGTS = gamstests ositests
    1616
    1717if COIN_HAS_CLP
    … …  
    1919endif
    2020if CBC_BUILD_CBC_GENERIC
     21if COIN_HAS_SAMPLE
    2122  CBC_TEST_TGTS += test_cbc_generic
     23endif
     24endif
     25
     26cbcflags =
     27ositestsflags =
     28if COIN_HAS_SAMPLE
     29  cbcflags += -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
     30  ositestsflags += -mpsDir=`$(CYGPATH_W) $(SAMPLE_DATA)`
     31endif
     32cbcflags += -unitTest
     33if COIN_HAS_MIPLIB3
     34  cbcflags += -dirMiplib `$(CYGPATH_W) $(MIPLIB3_DATA)` -miplib
     35endif
     36if COIN_HAS_NETLIB
     37  ositestsflags += -netlibDir=`$(CYGPATH_W) $(NETLIB_DATA)` -testOsiSolverInterface
    2238endif
    2339
    … …  
    2743
    2844test_cbc: ../src/cbc$(EXEEXT)
    29         if test x"$(DIRMIPLIB)" != x; then \
    30                 MIPLIBARG="-dirMiplib $(DIRMIPLIB) -miplib"; \
    31         fi; \
    32         if test x"$(DIRSAMPLE)" != x; then \
    33                 SAMPLEARG="-dirSample $(DIRSAMPLE)"; \
    34         fi; \
    35         ../src/cbc$(EXEEXT) $$SAMPLEARG -unitTest $$MIPLIBARG
     45        ../src/cbc$(EXEEXT) $(cbcflags)
    3646
     47if COIN_HAS_SAMPLE
    3748test_cbc_generic: ../src/cbc-generic$(EXEEXT)
    3849        echo "A minimal test is all that cbc-generic can manage just yet."
    3950        ../src/cbc-generic$(EXEEXT) \
    40             -directory ../../Data/Sample -import p0033.mps -branch
    41            
     51            -directory `$(CYGPATH_W) $(SAMPLE_DATA)` -import p0033.mps -branch
     52endif
     53
    4254gamstests: gamsTest$(EXEEXT)
    4355        ./gamsTest$(EXEEXT)
    … …  
    4557.PHONY: test
    4658
    47 bin_PROGRAMS = gamsTest
     59bin_PROGRAMS = gamsTest osiUnitTest
     60
    4861gamsTest_SOURCES = gamsTest.cpp
    49 gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la \
    50   $(CGLOBJDIR)/src/libCgl.la
     62gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(COINDEPEND_LIBS) $(ADDLIBS)
    5163gamsTest_LDFLAGS = -rpath $(libdir)
    52 LIBS = `cat $(CBCOBJDIR)/cbc_addlibs.txt` $(ADDLIBS)
    5364
    54 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` \
    55         -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    56         -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    57         -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    58         -I`$(CYGPATH_W) $(OSIOBJDIR)/inc`
     65AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(COINDEPEND_CFLAGS)
    5966
    6067if COIN_HAS_CLP
    61   AM_CPPFLAGS += -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    62         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    63         -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    64   gamsTest_LDADD += $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    65         $(CLPOBJDIR)/src/libClp.la
    66   LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
     68  AM_CPPFLAGS += $(CLP_CFLAGS)
     69  gamsTest_LDADD += $(CLP_LIBS)
    6770endif
    6871
    6972if COIN_HAS_CPX
    70   AM_CPPFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)` \
    71         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    72   gamsTest_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     73  AM_CPPFLAGS += $(CPX_CFLAGS)
     74  gamsTest_LDADD += $(CPX_LIBS)
    7375endif
    7476
    7577if COIN_HAS_DYLP
    76   AM_CPPFLAGS += -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/DylpStdLib` \
    77   -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/Dylp` \
    78   -I`$(CYGPATH_W) $(DYLPOBJDIR)/inc` \
    79         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
    80   gamsTest_LDADD += $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    81         $(DYLPOBJDIR)/src/Dylp/libDylp.la
    82   LIBS += `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
    83 endif
    84 
    85 if COIN_HAS_FMP
    86   AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    87   gamsTest_LDADD += $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
     78  AM_CPPFLAGS += $(DYLP_CFLAGS)
     79  gamsTest_LDADD += $(DYLP_LIBS)
    8880endif
    8981
    9082if COIN_HAS_GLPK
    91   AM_CPPFLAGS += -I`$(CYGPATH_W) $(GLPKINCDIR)` \
    92         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    93   gamsTest_LDADD += $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
     83  AM_CPPFLAGS += $(GLPK_CFLAGS)
     84  gamsTest_LDADD += $(GLPK_LIBS)
    9485endif
    9586
    9687if COIN_HAS_MSK
    97   AM_CPPFLAGS += -I`$(CYGPATH_W) $(MSKINCDIR)` \
    98         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    99   gamsTest_LDADD += $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
     88  AM_CPPFLAGS += $(MSK_CFLAGS)
     89  gamsTest_LDADD += $(MSK_LIBS)
    10090endif
    10191
    102 if COIN_HAS_OSL
    103   AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSLINCDIR)` \
    104         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    105   gamsTest_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    106 endif
    107 
    108 if COIN_HAS_SPX
    109   AM_CPPFLAGS += -I`$(CYGPATH_W) $(SPXINCDIR)` \
    110         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    111   gamsTest_LDADD += $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    112 endif
    113 
    114 if COIN_HAS_SYMPHONY
    115   AM_CPPFLAGS += -I`$(CYGPATH_W) $(SYMPHONYSRCDIR)/src` \
    116         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    117   gamsTest_LDADD += $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    118         $(SYMPHONYOBJDIR)/src/libSym.la
    119   LIBS += `cat $(SYMPHONYOBJDIR)/sym_addlibs.txt`
    120 endif
     92# if COIN_HAS_SPX
     93#   AM_CPPFLAGS += $(SPX_CFLAGS)
     94#   gamsTest_LDADD += $(SPX_LIBS)
     95# endif
    12196
    12297if COIN_HAS_VOL
    123   AM_CPPFLAGS += -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    124         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    125   gamsTest_LDADD += $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    126         $(VOLOBJDIR)/src/libVol.la
    127   LIBS += `cat $(VOLOBJDIR)/vol_addlibs.txt`
     98  AM_CPPFLAGS += $(VOL_CFLAGS)
     99  gamsTest_LDADD += $(VOL_LIBS)
    128100endif
    129101
    130102if COIN_HAS_XPR
    131   AM_CPPFLAGS += -I`$(CYGPATH_W) $(XPRINCDIR)` \
    132         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    133   gamsTest_LDADD += $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     103  AM_CPPFLAGS += $(XPR_CFLAGS)
     104  gamsTest_LDADD += $(XPR_LIBS)
    134105endif
    135106
    136107if COIN_HAS_ASL
    137   AM_CPPFLAGS += $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
    138   gamsTest_LDADD += $(ASLLIB)
     108  AM_CPPFLAGS += $(ASL_CFLAGS)
     109  gamsTest_LDADD += $(ASL_LIBS)
    139110endif
    140111
    141 gamsTest_LDADD += $(OSIOBJDIR)/src/libOsi.la \
    142         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    143 LIBS += `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
     112########################################################################
     113#                         unitTest for OsiCbc                          #
     114########################################################################
     115
     116osiUnitTest_SOURCES = osiUnitTest.cpp OsiCbcSolverInterfaceTest.cpp
     117
     118osiUnitTest_LDADD = ../src/libCbc.la ../src/OsiCbc/libOsiCbc.la $(COINDEPEND_LIBS) $(OSITESTS_LIBS) $(ADDLIBS)
     119
     120AM_CPPFLAGS += $(OSITESTS_CFLAGS) \
     121        -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc`
     122
     123ositests: osiUnitTest$(EXEEXT)
     124        ./osiUnitTest$(EXEEXT) $(ositestsflags)
    144125
    145126########################################################################
Note: See TracChangeset for help on using the changeset viewer.