Changed iterative fit to only fit to multicomponent data.

This commit is contained in:
titusquah
2020-07-31 10:05:35 -06:00
parent 9fef8b78fb
commit 16382b0145
20 changed files with 2357 additions and 193 deletions

View File

@@ -1,12 +1,12 @@
import scipy.optimize as scipy_opt
from scipy.optimize import minimize
# import skopt
def dual_anneal_optimizer(objective, x_guess):
bounds = [(1e-1, 1e1)] * len(x_guess)
bounds[1] = (1e-1, 2)
res = scipy_opt.dual_annealing(objective,
[(1e-1, 1e1)]*len(x_guess),
[(1e-1, 1e1)] * len(x_guess),
x0=x_guess)
est_parameters = res.x
return est_parameters, res.fun
@@ -19,21 +19,3 @@ def diff_evo_optimizer(objective, x_guess):
bounds)
est_parameters = res.x
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