Changeset 484:08d495d48089 in lemon
- Timestamp:
- 01/12/09 13:26:01 (16 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 8 added
- 8 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/Makefile.am
r482 r484 29 29 30 30 if HAVE_GLPK 31 lemon_libemon_la_SOURCES += lemon/ lp_glpk.cc31 lemon_libemon_la_SOURCES += lemon/glpk.cc 32 32 endif 33 33 34 34 if HAVE_CPLEX 35 lemon_libemon_la_SOURCES += lemon/ lp_cplex.cc35 lemon_libemon_la_SOURCES += lemon/cplex.cc 36 36 endif 37 37 38 38 if HAVE_SOPLEX 39 lemon_libemon_la_SOURCES += lemon/ lp_soplex.cc39 lemon_libemon_la_SOURCES += lemon/soplex.cc 40 40 endif 41 41 42 42 if HAVE_CLP 43 lemon_libemon_la_SOURCES += lemon/ lp_clp.cc43 lemon_libemon_la_SOURCES += lemon/clp.cc 44 44 endif 45 45 … … 51 51 lemon/bin_heap.h \ 52 52 lemon/circulation.h \ 53 lemon/clp.h \ 53 54 lemon/color.h \ 54 55 lemon/concept_check.h \ 55 56 lemon/counter.h \ 56 57 lemon/core.h \ 58 lemon/cplex.h \ 57 59 lemon/dfs.h \ 58 60 lemon/dijkstra.h \ … … 62 64 lemon/error.h \ 63 65 lemon/full_graph.h \ 66 lemon/glpk.h \ 64 67 lemon/graph_to_eps.h \ 65 68 lemon/grid_graph.h \ … … 72 75 lemon/lp.h \ 73 76 lemon/lp_base.h \ 74 lemon/lp_clp.h \75 lemon/lp_cplex.h \76 lemon/lp_glpk.h \77 77 lemon/lp_skeleton.h \ 78 lemon/lp_soplex.h \79 78 lemon/list_graph.h \ 80 79 lemon/maps.h \ … … 87 86 lemon/random.h \ 88 87 lemon/smart_graph.h \ 88 lemon/soplex.h \ 89 89 lemon/suurballe.h \ 90 90 lemon/time_measure.h \ -
lemon/lp.h
r482 r484 24 24 25 25 #ifdef HAVE_GLPK 26 #include <lemon/ lp_glpk.h>26 #include <lemon/glpk.h> 27 27 #elif HAVE_CPLEX 28 #include <lemon/ lp_cplex.h>28 #include <lemon/cplex.h> 29 29 #elif HAVE_SOPLEX 30 #include <lemon/ lp_soplex.h>30 #include <lemon/soplex.h> 31 31 #elif HAVE_CLP 32 #include <lemon/ lp_clp.h>32 #include <lemon/clp.h> 33 33 #endif 34 34 … … 44 44 ///\ingroup lp_group 45 45 /// 46 ///Currently, the possible values are \c LP_GLPK, \c LP_CPLEX, \c47 /// LP_SOPLEX or \c LP_CLP46 ///Currently, the possible values are \c GLPK, \c CPLEX, 47 ///\c SOPLEX or \c CLP 48 48 #define LEMON_DEFAULT_LP SOLVER 49 49 ///The default LP solver … … 60 60 ///\ingroup lp_group 61 61 /// 62 ///Currently, the possible values are \c MIP_GLPK or \c MIP_CPLEX62 ///Currently, the possible values are \c GLPK or \c CPLEX 63 63 #define LEMON_DEFAULT_MIP SOLVER 64 64 ///The default MIP solver. … … 71 71 #else 72 72 #ifdef HAVE_GLPK 73 # define LEMON_DEFAULT_LP LP_GLPK73 # define LEMON_DEFAULT_LP GLPK 74 74 typedef LpGlpk Lp; 75 # define LEMON_DEFAULT_MIP MIP_GLPK75 # define LEMON_DEFAULT_MIP GLPK 76 76 typedef MipGlpk Mip; 77 77 #elif HAVE_CPLEX 78 # define LEMON_DEFAULT_LP LP_CPLEX78 # define LEMON_DEFAULT_LP CPLEX 79 79 typedef LpCplex Lp; 80 # define LEMON_DEFAULT_MIP MIP_CPLEX80 # define LEMON_DEFAULT_MIP CPLEX 81 81 typedef MipCplex Mip; 82 82 #elif HAVE_SOPLEX 83 # define DEFAULT_LP LP_SOPLEX83 # define DEFAULT_LP SOPLEX 84 84 typedef LpSoplex Lp; 85 85 #elif HAVE_CLP 86 # define DEFAULT_LP LP_CLP86 # define DEFAULT_LP CLP 87 87 typedef LpClp Lp; 88 88 #endif -
test/lp_test.cc
r483 r484 27 27 28 28 #ifdef HAVE_GLPK 29 #include <lemon/ lp_glpk.h>29 #include <lemon/glpk.h> 30 30 #endif 31 31 32 32 #ifdef HAVE_CPLEX 33 #include <lemon/ lp_cplex.h>33 #include <lemon/cplex.h> 34 34 #endif 35 35 36 36 #ifdef HAVE_SOPLEX 37 #include <lemon/ lp_soplex.h>37 #include <lemon/soplex.h> 38 38 #endif 39 39 40 40 #ifdef HAVE_CLP 41 #include <lemon/ lp_clp.h>41 #include <lemon/clp.h> 42 42 #endif 43 43 -
test/mip_test.cc
r482 r484 25 25 26 26 #ifdef HAVE_CPLEX 27 #include <lemon/ lp_cplex.h>27 #include <lemon/cplex.h> 28 28 #endif 29 29 30 30 #ifdef HAVE_GLPK 31 #include <lemon/ lp_glpk.h>31 #include <lemon/glpk.h> 32 32 #endif 33 33
Note: See TracChangeset
for help on using the changeset viewer.