From 49c8f26ef20b28b401c599b9ce2db4e644080f6d Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Sat, 22 Jul 2023 07:23:15 -0700 Subject: [PATCH] [ModelBuilder] fix test with SCIP OFF --- ortools/linear_solver/python/model_builder_test.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ortools/linear_solver/python/model_builder_test.py b/ortools/linear_solver/python/model_builder_test.py index 87080fb5349..94714555526 100644 --- a/ortools/linear_solver/python/model_builder_test.py +++ b/ortools/linear_solver/python/model_builder_test.py @@ -64,6 +64,9 @@ def run_minimal_linear_example(self, solver_name): self.assertEqual(-math.inf, c2.lower_bound) solver = mb.ModelSolver(solver_name) + if not solver.solver_is_supported(): + print(f'Solver {solver_name} is not supported') + return self.assertTrue(pd.isna(solver.value(x1))) self.assertTrue(pd.isna(solver.value(x2))) self.assertTrue(pd.isna(solver.value(x3))) @@ -1687,6 +1690,9 @@ def test_solve_status( objective_expression=objective_expression, ) model_solver = mb.ModelSolver(solver["name"]) + if not model_solver.solver_is_supported(): + print(f'Solver {solver["name"]} is not supported') + return if solver.get("solver_specific_parameters"): model_solver.set_solver_specific_parameters( solver.get("solver_specific_parameters") @@ -1753,6 +1759,9 @@ def test_get_variable_values( objective_expression=objective_expression, ) model_solver = mb.ModelSolver(solver["name"]) + if not model_solver.solver_is_supported(): + print(f'Solver {solver["name"]} is not supported') + return if solver.get("solver_specific_parameters"): model_solver.set_solver_specific_parameters( solver.get("solver_specific_parameters") @@ -1828,6 +1837,9 @@ def test_get_objective_value( objective_expression=objective_expression, ) model_solver = mb.ModelSolver(solver["name"]) + if not model_solver.solver_is_supported(): + print(f'Solver {solver["name"]} is not supported') + return if solver.get("solver_specific_parameters"): model_solver.set_solver_specific_parameters( solver.get("solver_specific_parameters")