always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better treatment of quiet with scip

Browse Source
This commit is contained in:
lperron@google.com
2012-11-19 16:23:35 +00:00
parent 16541100da
commit 1a6ef82d18
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/linear_solver/scip_interface.cc
View File

@@ -151,9 +151,6 @@ class SCIPInterface : public MPSolverInterface {
SCIP* scip_;
std::vector<SCIP_VAR*> scip_variables_;
std::vector<SCIP_CONS*> scip_constraints_;
#if (SCIP_VERSION >= 300)
SCIP_MESSAGEHDLR* message_handler_;
#endif
};
// Creates a LP/MIP instance with the specified name and minimization objective.
@@ -193,9 +190,6 @@ void SCIPInterface::CreateSCIP() {
true, false, NULL, NULL, NULL, NULL, NULL));
ORTOOLS_SCIP_CALL(SCIPaddVar(scip_, scip_var));
scip_variables_.push_back(scip_var);
#if (SCIP_VERSION >= 300)
message_handler_ = SCIPgetMessagehdlr(scip_);
#endif
}
void SCIPInterface::DeleteSCIP() {
@@ -213,22 +207,18 @@ void SCIPInterface::DeleteSCIP() {
}
void SCIPInterface::WriteModel(const string& filename) {
#if (SCIP_VERSION < 300)
// The message handler also controls how the model is written to a file.
// If it is NULL, then nothing is written to the file.
#if (SCIP_VERSION >= 300)
ORTOOLS_SCIP_CALL(SCIPsetMessagehdlr(scip_, message_handler_));
#else
ORTOOLS_SCIP_CALL(SCIPsetDefaultMessagehdlr());
#endif
ORTOOLS_SCIP_CALL(SCIPwriteOrigProblem(scip_, filename.c_str(), NULL, false));
// Restore mesage handler to its original value.
#if (SCIP_VERSION < 300)
if (quiet_) {
#if (SCIP_VERSION >= 300)
ORTOOLS_SCIP_CALL(SCIPsetMessagehdlr(scip_, NULL));
#else
ORTOOLS_SCIP_CALL(SCIPsetMessagehdlr(NULL));
#endif
}
#endif
}
// ------ Model modifications and extraction -----
@@ -490,19 +480,15 @@ MPSolver::ResultStatus SCIPInterface::Solve(const MPSolverParameters& param) {
}
// Set log level.
#if (SCIP_VERSION >= 300)
SCIPsetMessagehdlrQuiet(scip_, quiet_);
#else
if (quiet_) {
#if (SCIP_VERSION >= 300)
ORTOOLS_SCIP_CALL(SCIPsetMessagehdlr(scip_, NULL));
#else
ORTOOLS_SCIP_CALL(SCIPsetMessagehdlr(NULL));
#endif
} else {
#if (SCIP_VERSION >= 300)
ORTOOLS_SCIP_CALL(SCIPsetMessagehdlr(scip_, message_handler_));
#else
ORTOOLS_SCIP_CALL(SCIPsetDefaultMessagehdlr());
#endif
}
#endif
// Special case if the model is empty since SCIP expects a non-empty model
if (solver_->variables_.size() == 0 && solver_->constraints_.size() == 0) {