Improved solver construction

ankane · Oct 6, 2024 · 6124930 · 6124930
1 parent 6e53a4e
commit 6124930
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/ext/or-tools/linear.cpp b/ext/or-tools/linear.cpp
@@ -59,7 +59,15 @@ void init_linear(Rice::Module& m) {
     .define_method("set_minimization", &MPObjective::SetMinimization);
 
   Rice::define_class_under<MPSolver>(m, "Solver")
-    .define_constructor(Rice::Constructor<MPSolver, std::string, MPSolver::OptimizationProblemType>())
+    .define_singleton_function(
+      "_new",
+      [](const std::string& name, MPSolver::OptimizationProblemType problem_type) {
+        std::unique_ptr<MPSolver> solver(new MPSolver(name, problem_type));
+        if (!solver) {
+          throw std::runtime_error("Unrecognized solver type");
+        }
+        return solver;
+      })
     .define_singleton_function(
       "_create",
       [](const std::string& solver_id) {

diff --git a/lib/or_tools/solver.rb b/lib/or_tools/solver.rb
@@ -30,16 +30,12 @@ def set_objective(expr)
       end
     end
 
-    # hack to work with Rice constructor
-    m = Module.new do
-      def new(solver_id, *args)
-        if args.empty?
-          _create(solver_id)
-        else
-          super
-        end
+    def self.new(solver_id, *args)
+      if args.empty?
+        _create(solver_id)
+      else
+        _new(solver_id, *args)
       end
     end
-    singleton_class.prepend(m)
   end
 end