Fixed bad_any_cast

ankane · Oct 6, 2024 · 5fe649b · 5fe649b
1 parent 58891cc
commit 5fe649b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/ext/or-tools/linear.cpp b/ext/or-tools/linear.cpp
@@ -47,10 +47,7 @@ namespace Rice::detail
 void init_linear(Rice::Module& m) {
   Rice::define_class_under<LinearRange>(m, "LinearRange");
 
-  auto rb_cLinearExpr = Rice::define_class_under<LinearExpr>(m, "LinearExpr");
-  rb_cLinearExpr.define_constructor(Rice::Constructor<LinearExpr>());
-
-  Rice::define_class_under<MPVariable, LinearExpr>(m, "MPVariable")
+  Rice::define_class_under<MPVariable>(m, "MPVariable")
     .define_method("name", &MPVariable::name)
     .define_method("solution_value", &MPVariable::solution_value);
 

diff --git a/lib/or-tools.rb b/lib/or-tools.rb
@@ -5,14 +5,14 @@
 require_relative "or_tools/comparison"
 require_relative "or_tools/comparison_operators"
 require_relative "or_tools/bool_var"
+require_relative "or_tools/linear_expr"
 require_relative "or_tools/constant"
 require_relative "or_tools/cp_model"
 require_relative "or_tools/cp_solver"
 require_relative "or_tools/cp_solver_solution_callback"
 require_relative "or_tools/int_var"
 require_relative "or_tools/knapsack_solver"
 require_relative "or_tools/linear_constraint"
-require_relative "or_tools/linear_expr"
 require_relative "or_tools/mp_variable"
 require_relative "or_tools/product_cst"
 require_relative "or_tools/routing_index_manager"

diff --git a/lib/or_tools/linear_expr.rb b/lib/or_tools/linear_expr.rb
@@ -1,5 +1,5 @@
 module ORTools
-  class LinearExpr
+  module LinearExprMethods
     def solution_value
       coeffs.sum { |var, coeff| var.solution_value * coeff }
     end
@@ -82,4 +82,8 @@ def coerce(other)
       end
     end
   end
+
+  class LinearExpr
+    include LinearExprMethods
+  end
 end
diff --git a/lib/or_tools/mp_variable.rb b/lib/or_tools/mp_variable.rb
@@ -1,5 +1,7 @@
 module ORTools
-  class MPVariable < LinearExpr
+  class MPVariable
+    include LinearExprMethods
+
     def add_self_to_coeff_map_or_stack(coeffs, multiplier, stack)
       coeffs[self] += multiplier
     end