remove knapsack solver interface

Author: lperron

ortools/linear_solver/BUILD.bazel

@@ -18,8 +18,6 @@ load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library")
 load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
-# For all the linear_solver_interface_tests rules.
-
 package(default_visibility = ["//visibility:public"])
 
 # OSS solvers
@@ -582,11 +580,18 @@ cc_binary(
 
 cc_library(
     name = "scip_helper_macros",
+    srcs = ["scip_helper_macros.cc"],
     hdrs = ["scip_helper_macros.h"],
     deps = [
         "//ortools/base:status_macros",
+        "@abseil-cpp//absl/base",
+        "@abseil-cpp//absl/base:nullability",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/log:check",
         "@abseil-cpp//absl/status",
-        "@abseil-cpp//absl/strings:str_format",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:string_view",
+        "@scip",
     ],
 )
 

ortools/linear_solver/CMakeLists.txt

@@ -23,9 +23,10 @@ list(APPEND _SRCS
   model_exporter.h
   model_validator.cc
   model_validator.h
+  sat_interface.cc
+  scip_helper_macros.cc
   solve_mp_model.cc
   solve_mp_model.h
-  sat_interface.cc
 )
 
 if(USE_BOP)

ortools/linear_solver/highs_interface.cc

@@ -224,14 +224,10 @@ int64_t HighsInterface::nodes() const {
 }
 
 MPSolver::BasisStatus HighsInterface::row_status(int constraint_index) const {
-  // TODO(user): While basis status isn't well defined for PDLP, we could
-  // guess statuses that might be useful.
   return MPSolver::BasisStatus::FREE;
 }
 
 MPSolver::BasisStatus HighsInterface::column_status(int variable_index) const {
-  // TODO(user): While basis status isn't well defined for PDLP, we could
-  // guess statuses that might be useful.
   return MPSolver::BasisStatus::FREE;
 }
 
@@ -241,10 +237,8 @@ bool HighsInterface::IsLP() const { return true; }
 
 bool HighsInterface::IsMIP() const { return solve_as_a_mip_; }
 
-std::string HighsInterface::SolverVersion() const { return "PDLP Solver"; }
+std::string HighsInterface::SolverVersion() const { return "HiGHS Solver"; }
 
-// TODO(user): Consider returning the SolveLog here, as it could be essential
-// for interpreting the PDLP solution.
 void* HighsInterface::underlying_solver() { return nullptr; }
 
 void HighsInterface::ExtractNewVariables() { NonIncrementalChange(); }