From 96857762dbcf1844cfb323d29565c80092f637b7 Mon Sep 17 00:00:00 2001 From: poveda_g Date: Wed, 25 Sep 2024 09:36:49 +0200 Subject: [PATCH] edited the optuna script --- .../optuna_expe/optuna_expe.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/examples/rcpsp_multiskill/optuna_expe/optuna_expe.py b/examples/rcpsp_multiskill/optuna_expe/optuna_expe.py index cf939876..4f47762f 100644 --- a/examples/rcpsp_multiskill/optuna_expe/optuna_expe.py +++ b/examples/rcpsp_multiskill/optuna_expe/optuna_expe.py @@ -9,6 +9,14 @@ get_data_available, parse_file_mslib, ) +from discrete_optimization.rcpsp_multiskill.rcpsp_multiskill_solvers import ( + GA_MSRCPSP_Solver, + LargeNeighborhoodSearchScheduling, + LS_RCPSP_Solver, +) +from discrete_optimization.rcpsp_multiskill.solvers.cp_solver_mspsp_instlib import ( + CP_MSPSP_MZN, +) from discrete_optimization.rcpsp_multiskill.solvers.cp_solvers import CP_MS_MRCPSP_MZN from discrete_optimization.rcpsp_multiskill.solvers.cpsat_msrcpsp_solver import ( CPSatMSRCPSPSolver, @@ -19,12 +27,20 @@ def script_optuna(): files_dict = get_data_available() file = [f for f in files_dict["MSLIB4"] if "MSLIB_Set4_1003.msrcp" in f][0] problem = parse_file_mslib(file, skill_level_version=False) + problem = problem.to_variant_model() generic_optuna_experiment_monoproblem( problem=problem, - solvers_to_test=[CPSatMSRCPSPSolver, CP_MS_MRCPSP_MZN], + solvers_to_test=[ + CPSatMSRCPSPSolver, + CP_MS_MRCPSP_MZN, + CP_MSPSP_MZN, + LS_RCPSP_Solver, + GA_MSRCPSP_Solver, + ], kwargs_fixed_by_solver={ CPSatMSRCPSPSolver: {"time_limit": 20}, CP_MS_MRCPSP_MZN: {"time_limit": 20}, + CP_MSPSP_MZN: {"time_limit": 20}, }, n_trials=100, )