diff --git a/ortools/algorithms/knapsack_solver.cc b/ortools/algorithms/knapsack_solver.cc index 79f87f55cb..e93b575b44 100644 --- a/ortools/algorithms/knapsack_solver.cc +++ b/ortools/algorithms/knapsack_solver.cc @@ -1143,12 +1143,6 @@ KnapsackSolver::KnapsackSolver(SolverType solver_type, MPSolver::CBC_MIXED_INTEGER_PROGRAMMING, solver_name)); break; #endif // USE_CBC - #if defined(USE_GLPK) - case KNAPSACK_MULTIDIMENSION_GLPK_MIP_SOLVER: - solver_.reset(new KnapsackMIPSolver( - MPSolver::GLPK_MIXED_INTEGER_PROGRAMMING, solver_name)); - break; - #endif // USE_GLPK #if defined(USE_SCIP) case KNAPSACK_MULTIDIMENSION_SCIP_MIP_SOLVER: solver_.reset(new KnapsackMIPSolver( diff --git a/ortools/algorithms/knapsack_solver.h b/ortools/algorithms/knapsack_solver.h index 40b92f5fc3..6cc8dbf5dc 100644 --- a/ortools/algorithms/knapsack_solver.h +++ b/ortools/algorithms/knapsack_solver.h @@ -91,9 +91,9 @@ namespace operations_research { // - KNAPSACK_MULTIDIMENSION_CBC_MIP_SOLVER: This solver can deal with both // large number of items and several dimensions. This solver is based on // Integer Programming solver CBC. -// - KNAPSACK_MULTIDIMENSION_GLPK_MIP_SOLVER: This solver can deal with both +// - KNAPSACK_MULTIDIMENSION_SCIP_MIP_SOLVER: This solver can deal with both // large number of items and several dimensions. This solver is based on -// Integer Programming solver GLPK. +// Integer Programming solver SCIP. // // KnapsackSolver also implements a problem reduction algorithm based on lower // and upper bounds (see Ingargolia and Korsh: A reduction algorithm for @@ -118,9 +118,6 @@ class KnapsackSolver { #if defined(USE_CBC) KNAPSACK_MULTIDIMENSION_CBC_MIP_SOLVER = 3, #endif // USE_CBC - #if defined(USE_GLPK) - KNAPSACK_MULTIDIMENSION_GLPK_MIP_SOLVER = 4, - #endif // USE_GLPK KNAPSACK_MULTIDIMENSION_BRANCH_AND_BOUND_SOLVER = 5, #if defined(USE_SCIP) KNAPSACK_MULTIDIMENSION_SCIP_MIP_SOLVER = 6, diff --git a/ortools/algorithms/python/knapsack_solver.i b/ortools/algorithms/python/knapsack_solver.i index 864d51e8c7..b1c936306f 100644 --- a/ortools/algorithms/python/knapsack_solver.i +++ b/ortools/algorithms/python/knapsack_solver.i @@ -46,7 +46,7 @@ %unignore operations_research::KnapsackSolver:: KNAPSACK_MULTIDIMENSION_CBC_MIP_SOLVER; %unignore operations_research::KnapsackSolver:: - KNAPSACK_MULTIDIMENSION_GLPK_MIP_SOLVER; + KNAPSACK_MULTIDIMENSION_SCIP_MIP_SOLVER; %include "ortools/algorithms/knapsack_solver.h"