Skip to content

Update to Optimization v5 #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
oschulz wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update to Optimization v5 #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Measures = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
Optim = "429524aa-4258-5aef-a3af-852621145aeb"
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
OptimizationBBO = "3e6eede4-6085-4f62-9a71-46d9bc1eb92b"
OptimizationLBFGSB = "22f7324a-a79d-40f2-bebe-3af60c77bd15"
OptimizationNLopt = "4e6fcdb7-1186-4e1f-a706-475e75c168bb"
OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
Expand Down Expand Up @@ -76,10 +77,11 @@ LsqFit = "0.14, 0.15"
Measurements = "2.5"
Measures = "0.3"
Optim = "1.7.5"
Optimization = "3.26.0, 4"
OptimizationBBO = "0.3, 0.4"
OptimizationNLopt = "0.2, 0.3"
OptimizationOptimJL = "0.3, 0.4"
Optimization = "5.0.0"
OptimizationBBO = "0.4.3"
OptimizationLBFGSB = "1.1.0"
OptimizationNLopt = "0.3.6"
OptimizationOptimJL = "0.4.6"
OrderedCollections = "1.1"
Plots = "1"
PropDicts = "0.2.4"
Expand Down
3 changes: 2 additions & 1 deletion src/LegendSpecFits.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ using Measurements
using Measurements: value
using Measurements: uncertainty
using OrderedCollections
using Optimization
using Optimization: solve, OptimizationFunction, OptimizationProblem, OptimizationState
using OptimizationBBO
using OptimizationNLopt
using OptimizationOptimJL
import OptimizationLBFGSB
using PropDicts
using RadiationSpectra
using RadiationSpectra: peakfinder
Expand Down
2 changes: 1 addition & 1 deletion src/aoefit.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ function fit_single_aoe_compton(h::Histogram, ps::NamedTuple; uncertainty::Bool=
# MLE
optf = OptimizationFunction((u, p) -> ((-) ∘ f_loglike ∘ inverse(f_trafo))(u), AutoForwardDiff())
optpro = OptimizationProblem(optf, v_init, ())
res = solve(optpro, Optimization.LBFGS(), maxiters = 3000) #, maxtime=optim_time_limit)
res = solve(optpro, OptimizationLBFGSB.LBFGSB(), maxiters = 3000) #, maxtime=optim_time_limit)

converged = (res.retcode == ReturnCode.Success)
if !converged @warn "Fit did not converge" end
Expand Down
4 changes: 2 additions & 2 deletions src/aoefit_combined.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function fit_single_aoe_compton_with_fixed_μ_and_σ(h::Histogram, μ::Number,
# MLE
optf = OptimizationFunction((u, p) -> ((-) ∘ f_loglike ∘ inverse(f_trafo))(u), AutoForwardDiff())
optpro = OptimizationProblem(optf, v_init, ())
res = solve(optpro, Optimization.LBFGS(), maxiters = 3000)#, maxtime=optim_time_limit)
res = solve(optpro, OptimizationLBFGSB.LBFGSB(), maxiters = 3000)#, maxtime=optim_time_limit)

converged = (res.retcode == ReturnCode.Success)
if !converged @warn "Fit did not converge" end
Expand Down Expand Up @@ -129,7 +129,7 @@ function neg_log_likelihood_single_aoe_compton_with_fixed_μ_and_σ(h::Histogram
if optimize
optf = OptimizationFunction((u, p) -> ((-) ∘ f_loglike ∘ inverse(f_trafo))(u), AutoForwardDiff())
optpro = OptimizationProblem(optf, v_init, ())
res = solve(optpro, Optimization.LBFGS(), maxiters = 3000)#, maxtime=optim_time_limit)
res = solve(optpro, OptimizationLBFGSB.LBFGSB(), maxiters = 3000)#, maxtime=optim_time_limit)

converged = (res.retcode == ReturnCode.Success)
if !converged @warn "Fit did not converge" end
Expand Down
2 changes: 1 addition & 1 deletion src/lqfit.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ function fit_single_lq_compton(h::Histogram, ps::NamedTuple; uncertainty::Bool=t
# MLE
optf = OptimizationFunction((u, p) -> ((-) ∘ f_loglike ∘ inverse(f_trafo))(u), AutoForwardDiff())
optpro = OptimizationProblem(optf, v_init, ())
res = solve(optpro, Optimization.LBFGS(), maxiters = 3000)#, maxtime=optim_time_limit)
res = solve(optpro, OptimizationLBFGSB.LBFGSB(), maxiters = 3000)#, maxtime=optim_time_limit)

converged = (res.retcode == ReturnCode.Success)
if !converged @warn "Fit did not converge" end
Expand Down
2 changes: 1 addition & 1 deletion src/memory_utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function advanced_time_and_memory_control( ; start_time::Float64=time(), start_m
if mem_limit < 0
mem_limit = optim_max_mem
end
function callback(x::Optimization.OptimizationState)
function callback(x::OptimizationState)
# @debug " * Iteration: $(x.iteration)"
so_far = time() - start_time
# @debug " * Time so far: $so_far"
Expand Down
12 changes: 6 additions & 6 deletions src/singlefit.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function fit_single_trunc_gauss(x::Vector{<:Unitful.RealOrRealQuantity}, cuts::N
# MLE
optf = OptimizationFunction((u, p) -> (f_loglike ∘ inverse(f_trafo))(u), AutoForwardDiff())
optpro = OptimizationProblem(optf, v_init, ())
res = solve(optpro, Optimization.LBFGS(), maxiters = 3000)#, maxtime=optim_time_limit)
res = solve(optpro, OptimizationLBFGSB.LBFGSB(), maxiters = 3000)#, maxtime=optim_time_limit)

converged = (res.retcode == ReturnCode.Success)
if !converged @warn "Fit did not converge" end
Expand Down Expand Up @@ -169,7 +169,7 @@ function fit_half_centered_trunc_gauss(x::Vector{<:Unitful.RealOrRealQuantity},
# MLE
optf = OptimizationFunction((u, p) -> (f_loglike ∘ inverse(f_trafo))(u), AutoForwardDiff())
optpro = OptimizationProblem(optf, v_init, ())
res = solve(optpro, Optimization.LBFGS(), maxiters = 3000)#, maxtime=optim_time_limit)
res = solve(optpro, OptimizationLBFGSB.LBFGSB(), maxiters = 3000)#, maxtime=optim_time_limit)

converged = (res.retcode == ReturnCode.Success)
if !converged @warn "Fit did not converge" end
Expand Down Expand Up @@ -289,7 +289,7 @@ function fit_half_trunc_gauss(x::Vector{<:Unitful.RealOrRealQuantity}, cuts::Nam
# MLE
optf = OptimizationFunction((u, p) -> (f_loglike ∘ inverse(f_trafo))(u), AutoForwardDiff())
optpro = OptimizationProblem(optf, v_init, ())
res = solve(optpro, Optimization.LBFGS(), maxiters = 3000)#, maxtime=optim_time_limit)
res = solve(optpro, OptimizationLBFGSB.LBFGSB(), maxiters = 3000)#, maxtime=optim_time_limit)

converged = (res.retcode == ReturnCode.Success)
if !converged @warn "Fit did not converge" end
Expand Down Expand Up @@ -421,7 +421,7 @@ function fit_binned_trunc_gauss(h_nocut::Histogram, cuts::NamedTuple{(:low, :hig
# MLE
optf = OptimizationFunction((u, p) -> ((-) ∘ f_loglike ∘ inverse(f_trafo))(u), AutoForwardDiff())
optpro = OptimizationProblem(optf, v_init, ())
res = solve(optpro, Optimization.LBFGS(), maxiters = 3000)#, maxtime=optim_time_limit)
res = solve(optpro, OptimizationLBFGSB.LBFGSB(), maxiters = 3000)#, maxtime=optim_time_limit)

converged = (res.retcode == ReturnCode.Success)
if !converged @warn "Fit did not converge" end
Expand Down Expand Up @@ -543,7 +543,7 @@ function fit_binned_half_trunc_gauss(h_nocut::Histogram, cuts::NamedTuple{(:low,
# MLE
optf = OptimizationFunction((u, p) -> ((-) ∘ f_loglike ∘ inverse(f_trafo))(u), AutoForwardDiff())
optpro = OptimizationProblem(optf, v_init, ())
res = solve(optpro, Optimization.LBFGS(), maxiters = 3000)#, maxtime=optim_time_limit)
res = solve(optpro, OptimizationLBFGSB.LBFGSB(), maxiters = 3000)#, maxtime=optim_time_limit)

converged = (res.retcode == ReturnCode.Success)
if !converged @warn "Fit did not converge" end
Expand Down Expand Up @@ -650,7 +650,7 @@ function fit_binned_double_gauss(h::Histogram, ps::NamedTuple; uncertainty::Bool
# MLE
optf = OptimizationFunction((u, p) -> ((-) ∘ f_loglike ∘ inverse(f_trafo))(u), AutoForwardDiff())
optpro = OptimizationProblem(optf, v_init, ())
res = solve(optpro, Optimization.LBFGS(), maxiters = 3000)#, maxtime=optim_time_limit)
res = solve(optpro, OptimizationLBFGSB.LBFGSB(), maxiters = 3000)#, maxtime=optim_time_limit)

converged = (res.retcode == ReturnCode.Success)
if !converged @warn "Fit did not converge" end
Expand Down
4 changes: 2 additions & 2 deletions src/specfit.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function fit_single_peak_th228(h::Histogram, ps::NamedTuple{(:peak_pos, :peak_fw
# MLE
optf = OptimizationFunction((u, p) -> ((-) ∘ f_loglike ∘ inverse(f_trafo))(u), AutoForwardDiff())
optpro = OptimizationProblem(optf, v_init, ())
res = solve(optpro, Optimization.LBFGS(), maxiters = 3000) #, maxtime=optim_time_limit)
res = solve(optpro, OptimizationLBFGSB.LBFGSB(), maxiters = 3000) #, maxtime=optim_time_limit)

converged = (res.retcode == ReturnCode.Success)
if !converged @warn "Fit did not converge" end
Expand Down Expand Up @@ -311,7 +311,7 @@ function fit_subpeaks_th228(
# MLE
optf = OptimizationFunction((u, p) -> ((-) ∘ f_loglike ∘ inverse(f_trafo))(u), AutoForwardDiff())
optpro = OptimizationProblem(optf, v_init, ())
res = solve(optpro, Optimization.LBFGS(), maxiters = 3000) #, maxtime=optim_time_limit)
res = solve(optpro, OptimizationLBFGSB.LBFGSB(), maxiters = 3000) #, maxtime=optim_time_limit)

converged = (res.retcode == ReturnCode.Success)
if !converged @warn "Fit did not converge" end
Expand Down
Loading