COIN-OR::LEMON - Graph Library

Changeset 1306:e00d7b681d8e in lemon for lemon/lp.h


Ignore:
Timestamp:
04/08/14 15:43:12 (6 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
1307:bdc029900564, 1309:489e243cfcb7
Phase:
public
Amend:
38356530386365363838383930333838646236316663393863306565326235373233316262373565
Message:

Bugfix in default LP/MIP setting (#465)

The bug was introduced in [fc3854d936f7]

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/lp.h

    r1300 r1306  
    4646  ///\ingroup lp_group
    4747  ///
    48   ///Currently, the possible values are \c GLPK, \c CPLEX,
    49   ///\c SOPLEX or \c CLP
     48  ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX,
     49  ///\c _LEMON_SOPLEX or \c LEMON__CLP
    5050#define LEMON_DEFAULT_LP SOLVER
    5151  ///The default LP solver
     
    6262  ///\ingroup lp_group
    6363  ///
    64   ///Currently, the possible values are \c GLPK, \c CPLEX or \c CBC
     64  ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX
     65  ///or \c _LEMON_CBC
    6566#define LEMON_DEFAULT_MIP SOLVER
    6667  ///The default MIP solver.
     
    7273  typedef GlpkMip Mip;
    7374#else
    74 #if LEMON_DEFAULT_LP == GLPK
     75#if LEMON_DEFAULT_LP == _LEMON_GLPK
    7576  typedef GlpkLp Lp;
    76 #elif LEMON_DEFAULT_LP == CPLEX
     77#elif LEMON_DEFAULT_LP == _LEMON_CPLEX
    7778  typedef CplexLp Lp;
    78 #elif LEMON_DEFAULT_LP == SOPLEX
     79#elif LEMON_DEFAULT_LP == _LEMON_SOPLEX
    7980  typedef SoplexLp Lp;
    80 #elif LEMON_DEFAULT_LP == CLP
     81#elif LEMON_DEFAULT_LP == _LEMON_CLP
    8182  typedef ClpLp Lp;
    8283#endif
    83 #if LEMON_DEFAULT_MIP == GLPK
     84#if LEMON_DEFAULT_MIP == _LEMON_GLPK
    8485  typedef GlpkMip Mip;
    85 #elif LEMON_DEFAULT_MIP == CPLEX
     86#elif LEMON_DEFAULT_MIP == _LEMON_CPLEX
    8687  typedef CplexMip Mip;
    87 #elif LEMON_DEFAULT_MIP == CBC
     88#elif LEMON_DEFAULT_MIP == _LEMON_CBC
    8889  typedef CbcMip Mip;
    8990#endif
Note: See TracChangeset for help on using the changeset viewer.