new parameter planes look

good, redoing with smaller range. Up to julia1.7-beta3

new parameter planes look
good, redoing with smaller range. Up to julia1.7-beta3
fb15d911 · Peter Jentsch · 68470fed · fb15d911 · fb15d911 · fb15d911
Commit fb15d911 authored Jul 09, 2021 by Peter Jentsch
--- a/CovidAlertVaccinationModel/Manifest.toml
+++ b/CovidAlertVaccinationModel/Manifest.toml
 # This file is machine-generated - editing it directly is not advised

-julia_version = "1.7.0-beta2"
+julia_version = "1.7.0-beta3.0"
 manifest_format = "2.0"

 [[deps.AbstractFFTs]]
@@ -57,9 +57,9 @@ version = "1.0.0"

 [[deps.AxisKeys]]
 deps = ["AbstractFFTs", "CovarianceEstimation", "IntervalSets", "InvertedIndices", "LazyStack", "LinearAlgebra", "NamedDims", "OffsetArrays", "Statistics", "StatsBase", "Tables"]
-git-tree-sha1 = "6632aef3eab31870c9cd3f49e8bc7cc50bed99b4"
+git-tree-sha1 = "f7a17e0381cd8e627d9793433074823a2c1d7096"
 uuid = "94b1ba4f-4ee9-5380-92f1-94cde586c3c5"
-version = "0.1.17"
+version = "0.1.18"

 [[deps.BangBang]]
 deps = ["Compat", "ConstructionBase", "Future", "InitialValues", "LinearAlgebra", "Requires", "Setfield", "Tables", "ZygoteRules"]
@@ -107,9 +107,9 @@ version = "0.10.11"

 [[deps.ColorSchemes]]
 deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random", "StaticArrays"]
-git-tree-sha1 = "c8fd01e4b736013bc61b704871d20503b33ea402"
+git-tree-sha1 = "ed268efe58512df8c7e224d2e170afd76dd6a417"
 uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
-version = "3.12.1"
+version = "3.13.0"

 [[deps.ColorTypes]]
 deps = ["FixedPointNumbers", "Random"]
@@ -134,9 +134,9 @@ deps = ["Artifacts", "Libdl"]
 uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"

 [[deps.CompositionsBase]]
-git-tree-sha1 = "f3955eb38944e5dd0fabf8ca1e267d94941d34a5"
+git-tree-sha1 = "455419f7e328a1a2493cabc6428d79e951349769"
 uuid = "a33af91c-f02d-484b-be07-31d278c5ca2b"
-version = "0.1.0"
+version = "0.1.1"

 [[deps.ConsoleProgressMonitor]]
 deps = ["Logging", "ProgressMeter"]
@@ -210,9 +210,9 @@ uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"

 [[deps.Dictionaries]]
 deps = ["Indexing", "Random"]
-git-tree-sha1 = "a170de2413818603ec9dd0aac30a13cb26afbd13"
+git-tree-sha1 = "011d10589449681ad631c0f866a2ce72771648c6"
 uuid = "85a47980-9c8c-11e8-2b9f-f7ca1fa99fb4"
-version = "0.3.9"
+version = "0.3.10"

 [[deps.Distances]]
 deps = ["LinearAlgebra", "Statistics", "StatsAPI"]
@@ -226,9 +226,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"

 [[deps.Distributions]]
 deps = ["FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"]
-git-tree-sha1 = "9f35e8c1b24d8d7337835942fb23210931d16f12"
+git-tree-sha1 = "d5fa76fdab7bf54615262bd639e8c2e9bf295444"
 uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
-version = "0.25.9"
+version = "0.25.10"

 [[deps.DocStringExtensions]]
 deps = ["LibGit2"]
@@ -289,9 +289,9 @@ version = "3.3.9+8"

 [[deps.FillArrays]]
 deps = ["LinearAlgebra", "Random", "SparseArrays"]
-git-tree-sha1 = "693210145367e7685d8604aee33d9bfb85db8b31"
+git-tree-sha1 = "25b9cc23ba3303de0ad2eac03f840de9104c9253"
 uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
-version = "0.11.9"
+version = "0.12.0"

 [[deps.FiniteDiff]]
 deps = ["ArrayInterface", "LinearAlgebra", "Requires", "SparseArrays", "StaticArrays"]
@@ -655,9 +655,9 @@ version = "0.4.7"

 [[deps.LoopVectorization]]
 deps = ["ArrayInterface", "DocStringExtensions", "IfElse", "LinearAlgebra", "OffsetArrays", "Polyester", "Requires", "SLEEFPirates", "Static", "StrideArraysCore", "ThreadingUtilities", "UnPack", "VectorizationBase"]
-git-tree-sha1 = "20316f08f70fae085ed90c7169ae318c036ee83b"
+git-tree-sha1 = "652a17092a160bb9677eefb18db31d717e7a4078"
 uuid = "bdcacae8-1622-11e9-2a5c-532679323890"
-version = "0.12.49"
+version = "0.12.50"

 [[deps.MKL_jll]]
 deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"]
@@ -671,6 +671,11 @@ git-tree-sha1 = "6a8a2a625ab0dea913aba95c11370589e0239ff0"
 uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 version = "0.5.6"

+[[deps.ManualMemory]]
+git-tree-sha1 = "2510eec385f6f4305be9ac9b8dbbe86f810ba62e"
+uuid = "d125e4d3-2237-4719-b19c-fa641b8a4667"
+version = "0.1.2"
+
 [[deps.Markdown]]
 deps = ["Base64"]
 uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
@@ -855,21 +860,21 @@ version = "1.0.11"

 [[deps.Plots]]
 deps = ["Base64", "Contour", "Dates", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs"]
-git-tree-sha1 = "9f126950870ef24ce75cdd841f4b7cf34affc6d2"
+git-tree-sha1 = "b93181645c1209d912d5632ba2d0094bc00703ad"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
-version = "1.18.0"
+version = "1.18.1"

 [[deps.Polyester]]
 deps = ["ArrayInterface", "IfElse", "Requires", "Static", "StrideArraysCore", "ThreadingUtilities", "VectorizationBase"]
-git-tree-sha1 = "0ad72bf3e19ceb7a3150b2fb35e746aa8c6e1c85"
+git-tree-sha1 = "2ccf43e4dcedfa4eab54a0848687a1a8b502c224"
 uuid = "f517fe37-dbe3-4b94-8317-1923a5111588"
-version = "0.3.2"
+version = "0.3.3"

 [[deps.Polynomials]]
 deps = ["Intervals", "LinearAlgebra", "MutableArithmetics", "RecipesBase"]
-git-tree-sha1 = "3685cb1e2ccbbb9973684774f956f5c6e4673bc9"
+git-tree-sha1 = "924935e4a24604784a79244cac529caa0e6b7aff"
 uuid = "f27b6e38-b328-58d1-80ce-0feddd5e7a45"
-version = "2.0.12"
+version = "2.0.13"

 [[deps.PooledArrays]]
 deps = ["DataAPI", "Future"]
@@ -1024,18 +1029,18 @@ version = "1.0.3"

 [[deps.SimpleTraits]]
 deps = ["InteractiveUtils", "MacroTools"]
-git-tree-sha1 = "daf7aec3fe3acb2131388f93a4c409b8c7f62226"
+git-tree-sha1 = "5d7e3f4e11935503d3ecaf7186eac40602e7d231"
 uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d"
-version = "0.9.3"
+version = "0.9.4"

 [[deps.Sockets]]
 uuid = "6462fe0b-24de-5631-8697-dd941f90decc"

 [[deps.SortingAlgorithms]]
 deps = ["DataStructures"]
-git-tree-sha1 = "2ec1962eba973f383239da22e75218565c390a96"
+git-tree-sha1 = "b3363d7460f7d098ca0912c69b082f75625d7508"
 uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
-version = "1.0.0"
+version = "1.0.1"

 [[deps.SparseArrays]]
 deps = ["LinearAlgebra", "Random"]
@@ -1061,9 +1066,9 @@ version = "0.2.5"

 [[deps.StaticArrays]]
 deps = ["LinearAlgebra", "Random", "Statistics"]
-git-tree-sha1 = "896d55218776ab8f23fb7b222a5a4a946d4aafc2"
+git-tree-sha1 = "a43a7b58a6e7dc933b2fa2e0ca653ccf8bb8fd0e"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "1.2.5"
+version = "1.2.6"

 [[deps.Statistics]]
 deps = ["LinearAlgebra", "SparseArrays"]
@@ -1088,9 +1093,9 @@ version = "0.9.8"

 [[deps.StrideArraysCore]]
 deps = ["ArrayInterface", "Requires", "ThreadingUtilities", "VectorizationBase"]
-git-tree-sha1 = "efcdfcbb8cf91e859f61011de1621be34b550e69"
+git-tree-sha1 = "1680c2e3bc985714a20b7a488a2fc4ef2949583e"
 uuid = "7792a7ef-975c-4747-a70f-980b88e8d1da"
-version = "0.1.13"
+version = "0.1.14"

 [[deps.StructArrays]]
 deps = ["Adapt", "DataAPI", "StaticArrays", "Tables"]
@@ -1139,10 +1144,10 @@ deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
 uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

 [[deps.ThreadingUtilities]]
-deps = ["VectorizationBase"]
-git-tree-sha1 = "28f4295cd761ce98db2b5f8c1fe6e5c89561efbe"
+deps = ["ManualMemory"]
+git-tree-sha1 = "593009385e6536dc50baedc2c8bc1a3717ef358f"
 uuid = "8290d209-cae3-49c0-8002-c8c24d57dab5"
-version = "0.4.4"
+version = "0.4.5"

 [[deps.ThreadsX]]
 deps = ["ArgCheck", "BangBang", "ConstructionBase", "InitialValues", "MicroCollections", "Referenceables", "Setfield", "SplittablesBase", "Transducers"]
@@ -1370,7 +1375,7 @@ uuid = "0ac62f75-1d6f-5e53-bd7c-93b484bb37c0"
 version = "0.14.0+4"

 [[deps.libblastrampoline_jll]]
-deps = ["Artifacts", "Libdl", "OpenBLAS_jll", "Pkg"]
+deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
 uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"

 [[deps.libfdk_aac_jll]]

--- a/CovidAlertVaccinationModel/abm_output/η_ω_en_EN_intervals.dat
+++ b/CovidAlertVaccinationModel/abm_output/η_ω_en_EN_intervals.dat
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/all_season/final_size_change.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/all_season/final_size_change.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/all_season/final_size_standard_dev.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/all_season/final_size_standard_dev.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/all_season/wdg_change_M.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/all_season/wdg_change_M.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/all_season/wdg_change_O.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/all_season/wdg_change_O.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/all_season/wdg_change_Y.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/all_season/wdg_change_Y.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/in_season/final_size_change.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/in_season/final_size_change.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/in_season/final_size_standard_dev.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/in_season/final_size_standard_dev.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/in_season/wdg_change_M.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/in_season/wdg_change_M.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/in_season/wdg_change_O.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/in_season/wdg_change_O.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/in_season/wdg_change_Y.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/in_season/wdg_change_Y.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/pre_season/final_size_change.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/pre_season/final_size_change.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/pre_season/final_size_standard_dev.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/pre_season/final_size_standard_dev.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/pre_season/wdg_change_M.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/pre_season/wdg_change_M.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/pre_season/wdg_change_O.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/pre_season/wdg_change_O.pdf
--- a/CovidAlertVaccinationModel/plots/app_heatmaps/pre_season/wdg_change_Y.pdf
+++ b/CovidAlertVaccinationModel/plots/app_heatmaps/pre_season/wdg_change_Y.pdf
--- a/CovidAlertVaccinationModel/src/ABM/parameter_planes.jl
+++ b/CovidAlertVaccinationModel/src/ABM/parameter_planes.jl

-const samples = 1
+const samples = 25
 const univariate_path = "CovidAlertVaccinationModel/plots/univariate/" 
 EN_begin_settings(p) = (
    all_season = Intervals.Interval(0,p.sim_length),
    pre_season = Intervals.Interval(0,p.infection_introduction_day),
-    in_season = Intervals.Interval(p.infection_introduction_day), p.sim_length)
+    in_season = Intervals.Interval(p.infection_introduction_day, p.sim_length)
 )

 function univarate_test(parameters,variable, variable_range; progmeter = nothing)
@@ -58,8 +58,8 @@ function multivariate_simulations()

    default_parameters = get_app_parameters() 
    app_simulations = (
-        (:η, range(0.0, 10.0; length = len)),
-        (:ω_en, range(0.0, 1e-1; length = len)),
+        (:η, range(0.0, 5.0; length = len)),
+        (:ω_en, range(0.0, 1e-2; length = len)),
        (:EN_intervals, EN_begin_settings(default_parameters))
        # (:notification_threshold, (1:len)),
    )
@@ -131,10 +131,10 @@ function plot_parameter_plane(input_fname)
            "final_size_standard_dev.pdf"
        ]
        titles = [
-            "Average w. deg. of vaccinators minus average w. deg., Y",
-            "Average w. deg. of vaccinators minus average w. deg., M",
-            "Average w. deg. of vaccinators minus average w. deg., O",
-            "Effect of notifications on tot. infections",
+            "Change in w. deg. of vaccinators with EN",
+            "Change in w. deg. of vaccinators with EN",
+            "Change in w. deg. of vaccinators with EN",
+            "Effect of EN on tot. infections",
            "Standard deviation from the mean of total infection size"
        ]
        for (fname,title,datamap) in zip(fnames,titles,datamaps)

--- a/CovidAlertVaccinationModel/src/CovidAlertVaccinationModel.jl
+++ b/CovidAlertVaccinationModel/src/CovidAlertVaccinationModel.jl
 module CovidAlertVaccinationModel
 using Intervals: Ending
-using Base: Float64
+using Base: Float64, NamedTuple
 using LightGraphs
 using RandomNumbers.Xorshifts
 using Random