diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7e3bd25..e9d8af3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,8 @@ - - - - - - - - + @@ -293,7 +293,8 @@ - @@ -313,11 +314,11 @@ - + - + @@ -367,11 +368,11 @@ - + - + diff --git a/llepe/optimizers.py b/llepe/optimizers.py index 221a069..49d3646 100644 --- a/llepe/optimizers.py +++ b/llepe/optimizers.py @@ -1,6 +1,6 @@ import scipy.optimize as scipy_opt from scipy.optimize import minimize -import skopt +# import skopt def dual_anneal_optimizer(objective, x_guess): bounds = [(1e-1, 1e1)] * len(x_guess) @@ -21,19 +21,19 @@ def diff_evo_optimizer(objective, x_guess): return est_parameters, res.fun -def forest_lbfgsb_optimizer(objective, x_guess): - x_guess = list(x_guess) - bounds = [(1e-1, 1e1)]*len(x_guess) - bounds[1] = (1e-1, 2) - res = skopt.forest_minimize(objective, - bounds, - random_state=1, - acq_func='LCB', - n_random_starts=30, - x0=x_guess, - xi=1e-4) - x_guess = res.x - optimizer_kwargs = {"method": 'l-bfgs-b', - "bounds": bounds} - res = minimize(objective, x_guess, **optimizer_kwargs) - return res.x, res.fun +# def forest_lbfgsb_optimizer(objective, x_guess): +# x_guess = list(x_guess) +# bounds = [(1e-1, 1e1)]*len(x_guess) +# bounds[1] = (1e-1, 2) +# res = skopt.forest_minimize(objective, +# bounds, +# random_state=1, +# acq_func='LCB', +# n_random_starts=30, +# x0=x_guess, +# xi=1e-4) +# x_guess = res.x +# optimizer_kwargs = {"method": 'l-bfgs-b', +# "bounds": bounds} +# res = minimize(objective, x_guess, **optimizer_kwargs) +# return res.x, res.fun