Changeset 1464 for trunk/Cbc/inc


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/inc/config_cbc.h.in

    r1456 r1464  
    44   letters */
    55#undef CBC_DEFAULT_SOLVER
     6
     7/* SVN revision number of project */
     8#undef CBC_SVN_REV
    69
    710/* Define to 1 if the SMP version of Cbc should be compiled */
     
    1720#undef COIN_CBC_VERBOSITY
    1821
    19 /* If defined, the Ampl Solver Library is available. */
     22/* Define to 1 if the ASL module is available */
    2023#undef COIN_HAS_ASL
    2124
    22 /* Define to 1 if the Cbc package is used */
    23 #undef COIN_HAS_CBC
    24 
    25 /* Define to 1 if the Cgl package is used */
    26 #undef COIN_HAS_CGL
    27 
    28 /* Define to 1 if the Clp package is used */
     25/* Define to 1 if the Clp module is available */
    2926#undef COIN_HAS_CLP
    3027
    31 /* Define to 1 if the CoinUtils package is used */
    32 #undef COIN_HAS_COINUTILS
     28/* Define to 1 if the COINDEPEND module is available */
     29#undef COIN_HAS_COINDEPEND
    3330
    34 /* Define to 1 if the Cplex package is available */
     31/* Define to 1 if the Cpx module is available */
    3532#undef COIN_HAS_CPX
    3633
    37 /* Define to 1 if the DyLP package is used */
     34/* Define to 1 if the DyLP module is available */
    3835#undef COIN_HAS_DYLP
    3936
    40 /* Define to 1 if the FortMP package is available */
    41 #undef COIN_HAS_FMP
    42 
    43 /* Define to 1 if Glpk package is available */
     37/* Define to 1 if the Glpk module is available */
    4438#undef COIN_HAS_GLPK
    4539
    46 /* Define to 1 if the Mosek package is available */
     40/* Define to 1 if the Grb module is available */
     41#undef COIN_HAS_GRB
     42
     43/* Define to 1 if the Miplib3 module is available */
     44#undef COIN_HAS_MIPLIB3
     45
     46/* Define to 1 if the Msk module is available */
    4747#undef COIN_HAS_MSK
    4848
    49 /* Define to 1 if the Osi package is used */
    50 #undef COIN_HAS_OSI
     49/* Define to 1 if the Netlib module is available */
     50#undef COIN_HAS_NETLIB
    5151
    52 /* Define to 1 if the Osl package is available */
    53 #undef COIN_HAS_OSL
     52/* Define to 1 if the OsiTests module is available */
     53#undef COIN_HAS_OSITESTS
    5454
    55 /* Define to 1 if the Soplex package is available */
    56 #undef COIN_HAS_SPX
     55/* Define to 1 if the Sample module is available */
     56#undef COIN_HAS_SAMPLE
    5757
    58 /* Define to 1 if the SYMPHONY package is used */
    59 #undef COIN_HAS_SYMPHONY
    60 
    61 /* Define to 1 if the Vol package is used */
     58/* Define to 1 if the Vol module is available */
    6259#undef COIN_HAS_VOL
    6360
    64 /* Define to 1 if the Xpress package is available */
     61/* Define to 1 if the Xpr module is available */
    6562#undef COIN_HAS_XPR
    6663
     
    9895#undef HAVE_UNISTD_H
    9996
     97/* define to the name of the default solver interface class, e.g.,
     98   OsiClpSolverInterface */
     99#undef OSICBC_DFLT_SOLVER
     100
     101/* define this symbol if clp is the default solver */
     102#undef OSICBC_DFLT_SOLVER_CLP
     103
     104/* define to the name of the .hpp file for the default solver interface class,
     105   e.g., "OsiClpSolverInterface.hpp" (include quotes) */
     106#undef OSICBC_DFLT_SOLVER_HPP
     107
    100108/* Name of package */
    101109#undef PACKAGE
Note: See TracChangeset for help on using the changeset viewer.