From b5b6bd40fc330ba1ce6c3770cdd2d4aae3ba7828 Mon Sep 17 00:00:00 2001 From: monty Date: Sun, 18 Aug 2024 11:47:10 -0400 Subject: [PATCH] minor test fixes --- examples/anasol/runtests.jl | 2 +- examples/contamination/runtests.jl | 4 +++- .../contamination/w01-w13a_w20a.initialresults | 3 --- .../w01-w13a_w20a_saltelli_5.jld2 | Bin 204847 -> 0 bytes .../internal-linearmodel.initialresults | 3 --- .../internal-linearmodel_efast_385.jld2 | Bin 16213 -> 0 bytes .../internal-linearmodel_saltelli_5.jld2 | Bin 15025 -> 0 bytes src/MadsIO.jl | 6 +++--- src/MadsYAML.jl | 4 ++-- 9 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 examples/contamination/w01-w13a_w20a.initialresults delete mode 100644 examples/contamination/w01-w13a_w20a_saltelli_5.jld2 delete mode 100644 examples/models/internal-linear-model/internal-linearmodel.initialresults delete mode 100644 examples/models/internal-linear-model/internal-linearmodel_efast_385.jld2 delete mode 100644 examples/models/internal-linear-model/internal-linearmodel_saltelli_5.jld2 diff --git a/examples/anasol/runtests.jl b/examples/anasol/runtests.jl index 45db824a..39fcc4e0 100644 --- a/examples/anasol/runtests.jl +++ b/examples/anasol/runtests.jl @@ -200,7 +200,7 @@ Test.@testset "Anasol" begin Test.@test isapprox(good_residuals, residuals_results, atol=1e-8) # Test Mads.getsourcekeys(md) - Test.@test sk == ["Source1_dz", "Source1_f", "Source1_t0", "Source1_x", "Source1_dy", "Source1_dx", "Source1_z", "Source1_t1", "Source1_y"] + Test.@test sk == ["Source1_x", "Source1_y", "Source1_z", "Source1_dx", "Source1_dy", "Source1_dz", "Source1_f", "Source1_t0", "Source1_t1"] # Test Mads.getparamsmin(md), getparamsmax, getparamsinit_min, getparamsinit_max Test.@test isapprox(m1, good_params_min, atol=1e-8) diff --git a/examples/contamination/runtests.jl b/examples/contamination/runtests.jl index 23562177..4102b3b1 100644 --- a/examples/contamination/runtests.jl +++ b/examples/contamination/runtests.jl @@ -188,7 +188,9 @@ end Mads.@stdouterrcapture Mads.addsource!(md) Mads.@stdouterrcapture Mads.removesource!(md) -Mads.rmdir("w01-w13a_w20a_restart") +Mads.rmfile(joinpath(workdir, "w01-w13a_w20a-match.svg")) +Mads.rmfile(joinpath(workdir,"w01-w13a_w20a.initialresults")) +Mads.rmfile(joinpath(workdir,"w01-w13a_w20a_saltelli_5.jld2")) Mads.veryquietoff() Mads.graphon() diff --git a/examples/contamination/w01-w13a_w20a.initialresults b/examples/contamination/w01-w13a_w20a.initialresults deleted file mode 100644 index 36c1fc3b..00000000 --- a/examples/contamination/w01-w13a_w20a.initialresults +++ /dev/null @@ -1,3 +0,0 @@ -OF: 1.690343089455085e7 -lambda: NaN -OrderedCollections.OrderedDict{Union{String, Symbol}, Float64}("vx" => 35.96220220262771, "source1_t0" => 9.038310530327282, "source1_t1" => 37.76819701889558) diff --git a/examples/contamination/w01-w13a_w20a_saltelli_5.jld2 b/examples/contamination/w01-w13a_w20a_saltelli_5.jld2 deleted file mode 100644 index 84da450504ee98173733032ef2f7dab30a4a3369..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204847 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 kbqd46xXMW8bHm`+_`xAVH?id7Ge diff --git a/examples/models/internal-linear-model/internal-linearmodel.initialresults b/examples/models/internal-linear-model/internal-linearmodel.initialresults deleted file mode 100644 index 4e9a9543..00000000 --- a/examples/models/internal-linear-model/internal-linearmodel.initialresults +++ /dev/null @@ -1,3 +0,0 @@ -OF: 46.0 -lambda: NaN -OrderedCollections.OrderedDict{Union{String, Symbol}, Float64}("a" => 1.0, "b" => -1.0) diff --git a/examples/models/internal-linear-model/internal-linearmodel_efast_385.jld2 b/examples/models/internal-linear-model/internal-linearmodel_efast_385.jld2 deleted file mode 100644 index 9f1fcda3c4f185469ef36d42bdd00c54edfff9b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16213 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 r>~C=g{G%1!G8P9l=rKe~Co?%S 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 diff --git a/src/MadsIO.jl b/src/MadsIO.jl index 780796fd..815ee31b 100644 --- a/src/MadsIO.jl +++ b/src/MadsIO.jl @@ -262,13 +262,13 @@ Example: md = Mads.loadmadsfile("input_file_name.mads") ``` """ -function loadmadsfile(filename::AbstractString; bigfile::Bool=false, format::AbstractString="yaml", quiet::Bool=Mads.quiet) +function loadmadsfile(filename::AbstractString; bigfile::Bool=false, format::AbstractString="yaml", quiet::Bool=Mads.quiet, dicttype=OrderedCollections.OrderedDict{Any,Any}) if bigfile madsdata = loadbigyamlfile(filename) end if !bigfile || isnothing(madsdata) if format == "yaml" - madsdata = loadyamlfile(filename) + madsdata = loadyamlfile(filename; dicttype=dicttype) elseif format == "json" madsdata = loadjsonfile(filename) end @@ -276,7 +276,7 @@ function loadmadsfile(filename::AbstractString; bigfile::Bool=false, format::Abs while typeof(madsdata) <: AbstractString # Windows links fix filename = joinpath(splitdir(filename)[1], madsdata) if format == "yaml" - madsdata = loadyamlfile(filename) + madsdata = loadyamlfile(filename; dicttype=dicttype) elseif format == "json" madsdata = loadjsonfile(filename) end diff --git a/src/MadsYAML.jl b/src/MadsYAML.jl index e7f7c91e..5eeabb41 100644 --- a/src/MadsYAML.jl +++ b/src/MadsYAML.jl @@ -13,8 +13,8 @@ Returns: - data in the yaml input file """ -function loadyamlfile(filename::AbstractString) - yamldata = YAML.load_file(filename; dicttype=OrderedCollections.OrderedDict{String,Any}) +function loadyamlfile(filename::AbstractString; dicttype=OrderedCollections.OrderedDict{Any,Any}) + yamldata = YAML.load_file(filename; dicttype=dicttype) return yamldata end