COIN-OR::LEMON - Graph Library

Changeset 1340:f70f688d9ef9 in lemon for lemon/lp.h


Ignore:
Timestamp:
04/28/15 18:07:07 (4 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Phase:
public
Message:

Replace #define WIN32 (#595)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/lp.h

    r1323 r1340  
    2323
    2424
    25 #if LEMON_DEFAULT_LP == _LEMON_GLPK || LEMON_DEFAULT_MIP == _LEMON_GLPK
     25#if LEMON_DEFAULT_LP == LEMON_GLPK_ || LEMON_DEFAULT_MIP == LEMON_GLPK_
    2626#include <lemon/glpk.h>
    2727#endif
    28 #if LEMON_DEFAULT_LP == _LEMON_CPLEX || LEMON_DEFAULT_MIP == _LEMON_CPLEX
     28#if LEMON_DEFAULT_LP == LEMON_CPLEX_ || LEMON_DEFAULT_MIP == LEMON_CPLEX_
    2929#include <lemon/cplex.h>
    3030#endif
    31 #if LEMON_DEFAULT_LP == _LEMON_SOPLEX
     31#if LEMON_DEFAULT_LP == LEMON_SOPLEX_
    3232#include <lemon/soplex.h>
    3333#endif
    34 #if LEMON_DEFAULT_LP == _LEMON_CLP
     34#if LEMON_DEFAULT_LP == LEMON_CLP_
    3535#include <lemon/clp.h>
    3636#endif
    37 #if LEMON_DEFAULT_MIP == _LEMON_CBC
     37#if LEMON_DEFAULT_MIP == LEMON_CBC_
    3838#include <lemon/cbc.h>
    3939#endif
     
    5050  ///\ingroup lp_group
    5151  ///
    52   ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX,
    53   ///\c _LEMON_SOPLEX or \c LEMON__CLP
     52  ///Currently, the possible values are \c LEMON_GLPK_, \c LEMON_CPLEX_,
     53  ///\c LEMON_SOPLEX_ or \c LEMON_CLP_
    5454#define LEMON_DEFAULT_LP SOLVER
    5555  ///The default LP solver
     
    6666  ///\ingroup lp_group
    6767  ///
    68   ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX
    69   ///or \c _LEMON_CBC
     68  ///Currently, the possible values are \c LEMON_GLPK_, \c LEMON_CPLEX_
     69  ///or \c LEMON_CBC_
    7070#define LEMON_DEFAULT_MIP SOLVER
    7171  ///The default MIP solver.
     
    7777  typedef GlpkMip Mip;
    7878#else
    79 #if LEMON_DEFAULT_LP == _LEMON_GLPK
     79#if LEMON_DEFAULT_LP == LEMON_GLPK_
    8080  typedef GlpkLp Lp;
    81 #elif LEMON_DEFAULT_LP == _LEMON_CPLEX
     81#elif LEMON_DEFAULT_LP == LEMON_CPLEX_
    8282  typedef CplexLp Lp;
    83 #elif LEMON_DEFAULT_LP == _LEMON_SOPLEX
     83#elif LEMON_DEFAULT_LP == LEMON_SOPLEX_
    8484  typedef SoplexLp Lp;
    85 #elif LEMON_DEFAULT_LP == _LEMON_CLP
     85#elif LEMON_DEFAULT_LP == LEMON_CLP_
    8686  typedef ClpLp Lp;
    8787#endif
    88 #if LEMON_DEFAULT_MIP == _LEMON_GLPK
     88#if LEMON_DEFAULT_MIP == LEMON_GLPK_
    8989  typedef GlpkMip Mip;
    90 #elif LEMON_DEFAULT_MIP == _LEMON_CPLEX
     90#elif LEMON_DEFAULT_MIP == LEMON_CPLEX_
    9191  typedef CplexMip Mip;
    92 #elif LEMON_DEFAULT_MIP == _LEMON_CBC
     92#elif LEMON_DEFAULT_MIP == LEMON_CBC_
    9393  typedef CbcMip Mip;
    9494#endif
Note: See TracChangeset for help on using the changeset viewer.