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

remove name from MPSolver.CreateSolver API; simplify underlying code

Browse Source
This commit is contained in:
Laurent Perron
2020-08-18 17:16:10 +02:00
parent c12c9992d5
commit 55cedb4b4b
43 changed files with 136 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
examples/cpp/integer_programming.cc
View File

@@ -18,19 +18,21 @@
#include "ortools/linear_solver/linear_solver.h"
namespace operations_research {
void RunIntegerProgrammingExample(
const std::string& optimization_problem_type) {
LOG(INFO) << "---- Integer programming example with "
<< optimization_problem_type << " ----";
void RunIntegerProgrammingExample(const std::string& solver_id) {
LOG(INFO) << "---- Integer programming example with " << solver_id << " ----";
if (!MPSolver::ParseAndCheckSupportForProblemType(
optimization_problem_type)) {
LOG(INFO) << " support for solver not linked in.";
MPSolver::OptimizationProblemType problem_type;
if (!MPSolver::ParseSolverType(solver_id, &problem_type)) {
LOG(INFO) << "Solver id " << solver_id << " not recognized";
return;
}
MPSolver solver("IntegerProgrammingExample",
MPSolver::ParseSolverTypeOrDie(optimization_problem_type));
if (!MPSolver::SupportsProblemType(problem_type)) {
LOG(INFO) << "Supports for solver " << solver_id << " not linked in.";
return;
}
MPSolver solver("IntegerProgrammingExample", problem_type);
const double infinity = solver.infinity();
// x and y are integer non-negative variables.
@@ -80,7 +82,6 @@ void RunAllExamples() {
RunIntegerProgrammingExample("GUROBI");
RunIntegerProgrammingExample("GLPK");
RunIntegerProgrammingExample("CPLEX");
RunIntegerProgrammingExample("XPRESS");
}
} // namespace operations_research

19
examples/cpp/linear_programming.cc
View File

@@ -19,17 +19,20 @@
#include "ortools/linear_solver/linear_solver.pb.h"
namespace operations_research {
void RunLinearProgrammingExample(const std::string& optimization_problem_type) {
LOG(INFO) << "---- Linear programming example with "
<< optimization_problem_type << " ----";
if (!MPSolver::ParseAndCheckSupportForProblemType(
optimization_problem_type)) {
LOG(INFO) << " support for solver not linked in.";
void RunLinearProgrammingExample(const std::string& solver_id) {
LOG(INFO) << "---- Linear programming example with " << solver_id << " ----";
MPSolver::OptimizationProblemType problem_type;
if (!MPSolver::ParseSolverType(solver_id, &problem_type)) {
LOG(INFO) << "Solver id " << solver_id << " not recognized";
return;
}
MPSolver solver("IntegerProgrammingExample",
MPSolver::ParseSolverTypeOrDie(optimization_problem_type));
if (!MPSolver::SupportsProblemType(problem_type)) {
LOG(INFO) << "Supports for solver " << solver_id << " not linked in.";
return;
}
MPSolver solver("IntegerProgrammingExample", problem_type);
const double infinity = solver.infinity();
// x1, x2 and x3 are continuous non-negative variables.