Changeset 2144:cd8897f67c26 in lemon-0.x
- Timestamp:
- 07/17/06 11:00:21 (18 years ago)
- Branch:
- default
- Phase:
- public
- Convert:
- svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2858
- Files:
-
- 3 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/Makefile.am
r2126 r2144 20 20 if HAVE_GLPK 21 21 lemon_libemon_la_SOURCES += lemon/lp_glpk.cc 22 lemon_libemon_la_SOURCES += lemon/mip_glpk.cc 22 23 endif 23 24 -
lemon/lp.h
r1956 r2144 24 24 #ifdef HAVE_GLPK 25 25 #include <lemon/lp_glpk.h> 26 #include <lemon/mip_glpk.h> 26 27 #elif HAVE_CPLEX 27 28 #include <lemon/lp_cplex.h> … … 55 56 ///Currently, the possible values are "GLPK" or "CPLEX" 56 57 const char default_solver_name[]="SOLVER"; 58 59 ///The default ILP solver. 60 61 ///The default ILP solver. 62 ///\ingroup gen_opt_group 63 /// 64 ///Currently, it is either \c LpGlpk or \c LpCplex 65 typedef MipGlpk Mip; 57 66 #else 58 67 #ifdef HAVE_GLPK 59 68 #define DEFAULT_LP GLPK 60 69 typedef LpGlpk Lp; 70 typedef MipGlpk Mip; 61 71 const char default_solver_name[]="GLPK"; 62 72 #elif HAVE_CPLEX -
lemon/lp_base.h
r2085 r2144 176 176 int id; 177 177 friend class LpSolverBase; 178 friend class MipSolverBase; 178 179 public: 179 180 typedef Value ExprValue; … … 1157 1158 }; 1158 1159 1159 ///\e 1160 1161 ///Common base class for ILP solvers 1162 ///\todo Much more docs 1163 ///\ingroup gen_opt_group 1164 class MipSolverBase : virtual public LpSolverBase{ 1165 public: 1166 1167 ///Set the type of the given Col to integer or remove that property. 1168 /// 1169 ///Set the type of the given Col to integer or remove that property. 1170 void integer(Col c, bool enable) { 1171 _integer(cols.floatingId(c.id),enable); 1172 } 1173 1174 ///Gives back the type of the column. 1175 /// 1176 ///Gives back the type of the column. 1177 ///\return true if the column has integer type and false if not. 1178 bool integer(Col c){ 1179 return _integer(cols.floatingId(c.id)); 1180 } 1181 1182 protected: 1183 1184 virtual bool _integer(int col) = 0; 1185 virtual void _integer(int col, bool enable) = 0; 1186 }; 1160 1187 1161 1188 ///\relates LpSolverBase::Expr -
lemon/lp_glpk.h
r1956 r2144 36 36 /// This class implements an interface for the GLPK LP solver. 37 37 ///\ingroup gen_opt_group 38 class LpGlpk : public LpSolverBase {38 class LpGlpk : virtual public LpSolverBase { 39 39 protected: 40 40 LPX* lp; -
test/Makefile.am
r2119 r2144 29 29 test/max_matching_test \ 30 30 test/min_cost_flow_test \ 31 test/mip_test \ 31 32 test/path_test \ 32 33 test/polynomial_test \ … … 71 72 test_max_matching_test_SOURCES = test/max_matching_test.cc 72 73 test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc 74 test_mip_test_SOURCES = test/mip_test.cc 73 75 test_path_test_SOURCES = test/path_test.cc 74 76 test_polynomial_test_SOURCES = test/polynomial_test.cc
Note: See TracChangeset
for help on using the changeset viewer.