diff --git a/examples/anasol/runtests.jl b/examples/anasol/runtests.jl index bf440c8b..dc873974 100644 --- a/examples/anasol/runtests.jl +++ b/examples/anasol/runtests.jl @@ -13,7 +13,7 @@ workdir = joinpath(Mads.dir, "examples", "anasol") md = Mads.loadmadsfile(joinpath(workdir, "w01shortexpplus.mads")) computeconcentrations = Mads.makecomputeconcentrations(md) computeconcentrations() -Mads.calibrate(md; maxEval=1, maxJacobians=1, np_lambda=1, usenaive=true, save_results=false) +Mads.calibrate(md; maxEval=1, maxJacobians=1, np_lambda=1, usenaive=true) md = Mads.loadmadsfile(joinpath(workdir, "w01shortexp.mads")) forward_results = Mads.forward(md; all=true) paramrandom_true = Mads.getparamrandom(md, 5; init_dist=true) diff --git a/examples/contamination/w01-w13a_w20a-saltelli-5.jld2 b/examples/contamination/w01-w13a_w20a-saltelli-5.jld2 index 1328084d..35c4d791 100644 Binary files a/examples/contamination/w01-w13a_w20a-saltelli-5.jld2 and b/examples/contamination/w01-w13a_w20a-saltelli-5.jld2 differ diff --git a/examples/model_coupling/external-linearmodel+template+instruction+path/external-linearmodel+template+instruction+path-eigenmatrix.svg b/examples/model_coupling/external-linearmodel+template+instruction+path/external-linearmodel+template+instruction+path-eigenmatrix.svg index f9f31b54..93c458e8 100644 --- a/examples/model_coupling/external-linearmodel+template+instruction+path/external-linearmodel+template+instruction+path-eigenmatrix.svg +++ b/examples/model_coupling/external-linearmodel+template+instruction+path/external-linearmodel+template+instruction+path-eigenmatrix.svg @@ -14,15 +14,15 @@ - - + + Eigenvectors - + 1 @@ -34,11 +34,11 @@ - - - + + + - 1.0 + -1.0 @@ -46,9 +46,9 @@ -0.5 - + - 0.0 + 1.0 @@ -56,13 +56,13 @@ 0.5 - + - -1.0 + 0.0 - + @@ -183,25 +183,25 @@ - - + + - + - + - + Color @@ -209,59 +209,59 @@ - - - - + + + + - - + + - - + + - + - - + + - + - + - + - - + + a - + b - - + + Parameters @@ -269,7 +269,7 @@ - + diff --git a/examples/model_coupling/external-linearmodel+template+instruction+path/external-linearmodel+template+instruction+path-eigenvalues.svg b/examples/model_coupling/external-linearmodel+template+instruction+path/external-linearmodel+template+instruction+path-eigenvalues.svg index 25180fb4..a6978b9b 100644 --- a/examples/model_coupling/external-linearmodel+template+instruction+path/external-linearmodel+template+instruction+path-eigenvalues.svg +++ b/examples/model_coupling/external-linearmodel+template+instruction+path/external-linearmodel+template+instruction+path-eigenvalues.svg @@ -14,15 +14,15 @@ - - + + Eigenvectors - + 1 @@ -34,46 +34,46 @@ - - - - + + + + - - + + - + - + - + - + - + - - + + - + - - - + + + @@ -81,40 +81,40 @@ - - + + 10-4.0 - + 10-3.5 - + 10-3.0 - + 10-2.5 - + 10-2.0 - + 10-1.5 - - + + Eigenvalues @@ -122,7 +122,7 @@ - + diff --git a/examples/model_coupling/external-linearmodel+template+instruction+path/external-linearmodel+template+instruction+path-jacobian.svg b/examples/model_coupling/external-linearmodel+template+instruction+path/external-linearmodel+template+instruction+path-jacobian.svg index a5b89124..83284d03 100644 --- a/examples/model_coupling/external-linearmodel+template+instruction+path/external-linearmodel+template+instruction+path-jacobian.svg +++ b/examples/model_coupling/external-linearmodel+template+instruction+path/external-linearmodel+template+instruction+path-jacobian.svg @@ -14,15 +14,15 @@ - - + + Parameters - + a @@ -34,11 +34,11 @@ - - - + + + - 40 + -40 @@ -46,9 +46,9 @@ -20 - + - 0 + 40 @@ -56,13 +56,13 @@ 20 - + - -40 + 0 - + @@ -183,25 +183,25 @@ - - + + - + - + - + Color @@ -209,87 +209,87 @@ - - - - + + + + - - + + - + - + - - + + - + - - + + - + - + - + - + - + - + - + - - + + o1 - + o2 - + o3 - + o4 - - + + Observations @@ -297,7 +297,7 @@ - + diff --git a/examples/models/internal-linear-model/internal-linearmodel-5-spaghetti.svg b/examples/models/internal-linear-model/internal-linearmodel-5-spaghetti.svg index f42d8d06..4ac3007a 100644 --- a/examples/models/internal-linear-model/internal-linearmodel-5-spaghetti.svg +++ b/examples/models/internal-linear-model/internal-linearmodel-5-spaghetti.svg @@ -14,8 +14,8 @@ - - + + 0 @@ -42,126 +42,126 @@ - - - - + + + + - - + + - + - + - + - + - + - + - - + + - + - + - + - + - + - - + + - + - + - + - + - - - - + + + + - - + + 4.0,9.0 - - - + + + - - + + 3.0,5.0 - - - + + + - - + + 2.0,1.0 - - - + + + - - + + 1.0,-3.0 @@ -172,38 +172,38 @@ - - + + -50 - + -40 - + -30 - + -20 - + -10 - + 0 - + 10 @@ -211,7 +211,7 @@ - + diff --git a/examples/models/internal-linear-model/internal-linearmodel-a-5-spaghetti.svg b/examples/models/internal-linear-model/internal-linearmodel-a-5-spaghetti.svg index f5ff798b..9bdf38fa 100644 --- a/examples/models/internal-linear-model/internal-linearmodel-a-5-spaghetti.svg +++ b/examples/models/internal-linear-model/internal-linearmodel-a-5-spaghetti.svg @@ -14,8 +14,8 @@ - - + + 0 @@ -42,144 +42,144 @@ - - - - + + + + - - + + - + - + - + - + - + - + - - + + - + - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - + + 4.0,9.0 - - - + + + - - + + 3.0,5.0 - - - + + + - - + + 2.0,1.0 - - - + + + - - + + 1.0,-3.0 @@ -190,38 +190,38 @@ - - + + -40 - + -30 - + -20 - + -10 - + 0 - + 10 - + 20 @@ -229,7 +229,7 @@ - + diff --git a/examples/models/internal-linear-model/internal-linearmodel-b-5-spaghetti.svg b/examples/models/internal-linear-model/internal-linearmodel-b-5-spaghetti.svg index 7ab4125b..1390b04e 100644 --- a/examples/models/internal-linear-model/internal-linearmodel-b-5-spaghetti.svg +++ b/examples/models/internal-linear-model/internal-linearmodel-b-5-spaghetti.svg @@ -14,8 +14,8 @@ - - + + 0 @@ -42,138 +42,138 @@ - - - - + + + + - - + + - + - + - + - + - - + + - + - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - + + 4.0,9.0 - - - + + + - - + + 3.0,5.0 - - - + + + - - + + 2.0,1.0 - - - + + + - - + + 1.0,-3.0 @@ -184,28 +184,28 @@ - - + + -10 - + -5 - + 0 - + 5 - + 10 @@ -213,7 +213,7 @@ - + diff --git a/examples/models/internal-linear-model/internal-linearmodel-efast-385.jld2 b/examples/models/internal-linear-model/internal-linearmodel-efast-385.jld2 index a17af9ea..0b61e807 100644 Binary files a/examples/models/internal-linear-model/internal-linearmodel-efast-385.jld2 and b/examples/models/internal-linear-model/internal-linearmodel-efast-385.jld2 differ diff --git a/examples/models/internal-linear-model/internal-linearmodel-saltelli-5.jld2 b/examples/models/internal-linear-model/internal-linearmodel-saltelli-5.jld2 index 5d83c7bb..7ddd4b78 100644 Binary files a/examples/models/internal-linear-model/internal-linearmodel-saltelli-5.jld2 and b/examples/models/internal-linear-model/internal-linearmodel-saltelli-5.jld2 differ diff --git a/examples/models/internal-polynomial-model/internal-polynomial-efast-385.jld2 b/examples/models/internal-polynomial-model/internal-polynomial-efast-385.jld2 index b3b55523..6b559a22 100644 Binary files a/examples/models/internal-polynomial-model/internal-polynomial-efast-385.jld2 and b/examples/models/internal-polynomial-model/internal-polynomial-efast-385.jld2 differ diff --git a/src/MadsMonteCarlo.jl b/src/MadsMonteCarlo.jl index d57a7e30..feef73fe 100644 --- a/src/MadsMonteCarlo.jl +++ b/src/MadsMonteCarlo.jl @@ -128,7 +128,7 @@ function emceesampling(madsdata::AbstractDict, p0::AbstractMatrix; filename::Abs Mads.setseed(seed; rng=rng) madsloglikelihood = makemadsloglikelihood(madsdata; weightfactor=weightfactor) arrayloglikelihood = Mads.makearrayloglikelihood(madsdata, madsloglikelihood) - sleep(1) # rest to avoid method too new error + sleep(1) # rest to avoid a "method too new" error if distributed_function @Distributed.everywhere arrayloglikelihood_distributed = Mads.makearrayloglikelihood($madsdata, $madsloglikelihood) arrayloglikelihood = (x)->Core.eval(Main, :arrayloglikelihood_distributed)(x) diff --git a/src/MadsParameters.jl b/src/MadsParameters.jl index 86f16223..9d97cc09 100644 --- a/src/MadsParameters.jl +++ b/src/MadsParameters.jl @@ -18,7 +18,7 @@ function isparam(madsdata::AbstractDict, dict::AbstractDict) partype = getparamstype(madsdata) else par = collect(keys(madsdata)) - partype = "" + partype = "opt" end flag = true for i in par