From 5fe6a2a44bfcb15d01c2abd39862e14af6bab53a Mon Sep 17 00:00:00 2001 From: Vaibhav Kumar Dixit Date: Tue, 12 Dec 2023 11:47:14 -0500 Subject: [PATCH 1/3] Update ensemble_problems.jl --- src/ensemble/ensemble_problems.jl | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/ensemble/ensemble_problems.jl b/src/ensemble/ensemble_problems.jl index 4ad493495..a7d45ef6f 100644 --- a/src/ensemble/ensemble_problems.jl +++ b/src/ensemble/ensemble_problems.jl @@ -50,17 +50,6 @@ function SciMLBase.EnsembleProblem(prob::AbstractSciMLProblem, u0s::Vector{Vecto return SciMLBase.EnsembleProblem(prob; prob_func, kwargs...) end -#only makes sense for OptimizationProblem, might make sense for IntervalNonlinearProblem -function SciMLBase.EnsembleProblem(prob::OptimizationProblem, trajectories::Int; kwargs...) - if prob.lb !== nothing && prob.ub !== nothing - u0s = QuasiMonteCarlo.sample(trajectories, prob.lb, prob.ub, QuasiMonteCarlo.LatinHypercubeSample()) - prob_func = (prob, i, repeat = nothing) -> remake(prob, u0 = u0s[:, i]) - else - error("EnsembleProblem with `trajectories` as second argument requires lower and upper bounds to be defined in the `OptimizationProblem`.") - end - return SciMLBase.EnsembleProblem(prob; prob_func, kwargs...) -end - struct WeightedEnsembleProblem{T1 <: AbstractEnsembleProblem, T2 <: AbstractVector} <: AbstractEnsembleProblem ensembleprob::T1 From 8e198ad675c9d7932be7a814231485240f16c816 Mon Sep 17 00:00:00 2001 From: Vaibhav Kumar Dixit Date: Tue, 12 Dec 2023 11:48:55 -0500 Subject: [PATCH 2/3] Update Project.toml --- Project.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Project.toml b/Project.toml index b2e8c4eca..8c54b51a8 100644 --- a/Project.toml +++ b/Project.toml @@ -20,7 +20,6 @@ Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a" PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a" Preferences = "21216c6a-2e73-6563-6e65-726566657250" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" -QuasiMonteCarlo = "8a4e6c94-4038-4cdc-81c3-7e6ffdb2a71b" RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" @@ -83,7 +82,6 @@ Statistics = "1.9" SymbolicIndexingInterface = "0.2" Tables = "1.11" TruncatedStacktraces = "1.4" -QuasiMonteCarlo = "0.2.19, 0.3" Zygote = "0.6.67" julia = "1.9" From 022811ae78eedbc9588d214fc80c99397266bdee Mon Sep 17 00:00:00 2001 From: Vaibhav Kumar Dixit Date: Tue, 12 Dec 2023 11:49:16 -0500 Subject: [PATCH 3/3] Update SciMLBase.jl --- src/SciMLBase.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SciMLBase.jl b/src/SciMLBase.jl index 068027b4b..b7401404b 100644 --- a/src/SciMLBase.jl +++ b/src/SciMLBase.jl @@ -23,7 +23,7 @@ import EnumX import TruncatedStacktraces import ADTypes: AbstractADType import FillArrays -import QuasiMonteCarlo + using Reexport using SciMLOperators using SciMLOperators: