COIN-OR::LEMON - Graph Library

Changeset 1300:62dba6c90f35 in lemon


Ignore:
Timestamp:
10/24/13 13:04:00 (6 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
1301:7a833615b224, 1303:1ba759c76810
Phase:
public
Message:

Fix default LP/MIP setting (#479)

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r1264 r1300  
    122122  SET(LEMON_DEFAULT_LP ${DEFAULT_LP} CACHE STRING
    123123    "Default LP solver backend (GLPK, CPLEX, CLP or SOPLEX)" FORCE)
     124ELSE()
     125  SET(LEMON_DEFAULT_LP ${DEFAULT_LP} CACHE STRING
     126    "Default LP solver backend (GLPK, CPLEX, CLP or SOPLEX)")
    124127ENDIF()
    125128IF(NOT LEMON_DEFAULT_MIP OR
     
    129132  SET(LEMON_DEFAULT_MIP ${DEFAULT_MIP} CACHE STRING
    130133    "Default MIP solver backend (GLPK, CPLEX or CBC)" FORCE)
     134ELSE()
     135  SET(LEMON_DEFAULT_MIP ${DEFAULT_MIP} CACHE STRING
     136    "Default MIP solver backend (GLPK, CPLEX or CBC)")
    131137ENDIF()
    132138
  • lemon/lp.h

    r1270 r1300  
    3131#elif LEMON_HAVE_CLP
    3232#include <lemon/clp.h>
     33#elif LEMON_HAVE_CBC
     34#include <lemon/cbc.h>
    3335#endif
    3436
     
    8082#endif
    8183#if LEMON_DEFAULT_MIP == GLPK
    82   typedef GlpkLp Mip;
     84  typedef GlpkMip Mip;
    8385#elif LEMON_DEFAULT_MIP == CPLEX
    8486  typedef CplexMip Mip;
  • test/lp_test.cc

    r1270 r1300  
    4040#endif
    4141
     42#ifdef LEMON_HAVE_LP
     43#include <lemon/lp.h>
     44#endif
    4245using namespace lemon;
    4346
     
    417420  lpTest(lp_skel);
    418421
     422#ifdef LEMON_HAVE_LP
     423  {
     424    Lp lp,lp2;
     425    lpTest(lp);
     426    aTest(lp2);
     427    cloneTest<Lp>();
     428  }
     429#endif
     430
    419431#ifdef LEMON_HAVE_GLPK
    420432  {
  • test/mip_test.cc

    r795 r1300  
    3131#ifdef LEMON_HAVE_CBC
    3232#include <lemon/cbc.h>
     33#endif
     34
     35#ifdef LEMON_HAVE_MIP
     36#include <lemon/lp.h>
    3337#endif
    3438
     
    129133{
    130134
     135#ifdef LEMON_HAVE_MIP
     136  {
     137    Mip mip1;
     138    aTest(mip1);
     139    cloneTest<Mip>();
     140  }
     141#endif
     142
    131143#ifdef LEMON_HAVE_GLPK
    132144  {
Note: See TracChangeset for help on using the changeset viewer.