Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Peter Jentsch
CovidAlertABM
Commits
b4fa17e4
Commit
b4fa17e4
authored
Jul 22, 2021
by
Peter Jentsch
Browse files
fix bug in shift... use distributions rather than sampler
parent
0c4e34f0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
CovidAlertVaccinationModel/src/ABM/mixing_distributions.jl
CovidAlertVaccinationModel/src/ABM/mixing_distributions.jl
+1
-1
CovidAlertVaccinationModel/src/data.jl
CovidAlertVaccinationModel/src/data.jl
+4
-4
No files found.
CovidAlertVaccinationModel/src/ABM/mixing_distributions.jl
View file @
b4fa17e4
...
@@ -39,7 +39,7 @@ const contact_time_distributions = load_contact_time_distributions()
...
@@ -39,7 +39,7 @@ const contact_time_distributions = load_contact_time_distributions()
function
shift_contact_distributions
(
sampler_matrix
::
AbstractMatrix
{
T
},
proportion
)
where
T
<:
Distributions
.
PoissonADSampler
function
shift_contact_distributions
(
sampler_matrix
::
AbstractMatrix
{
T
},
proportion
)
where
T
<:
Distributions
.
PoissonADSampler
return
map
(
sampler_matrix
)
do
sampler
return
map
(
sampler_matrix
)
do
sampler
μ_old
=
sampler
.
μ
μ_old
=
sampler
.
μ
return
Distributions
.
PoissonADSampler
(
μ_old
*
proportion
)
return
Poisson
(
μ_old
*
proportion
)
end
end
end
end
...
...
CovidAlertVaccinationModel/src/data.jl
View file @
b4fa17e4
...
@@ -101,9 +101,9 @@ function load_mixing_matrices()
...
@@ -101,9 +101,9 @@ function load_mixing_matrices()
return
map
(
t
->
from_mean
.
(
Geometric
{
Float64
},
t
),
workschool_mixing
),
map
(
t
->
from_mean
.
(
Geometric
{
Float64
},
t
),
rest_mixing
)
return
map
(
t
->
from_mean
.
(
Geometric
{
Float64
},
t
),
workschool_mixing
),
map
(
t
->
from_mean
.
(
Geometric
{
Float64
},
t
),
rest_mixing
)
end
end
function
make_sampler
(
λ
)
#
function make_sampler(λ)
return
Distributions
.
PoissonADSampler
(
λ
)
#Distributions.DiscreteNonParametricSampler(0:durmax,[pdf(Poisson(λ),x) for x in 0:durmax])
#
return Distributions.PoissonADSampler(λ)#Distributions.DiscreteNonParametricSampler(0:durmax,[pdf(Poisson(λ),x) for x in 0:durmax])
end
#
end
function
load_contact_time_distributions
()
function
load_contact_time_distributions
()
distkey
=
"Distributions.Poisson"
distkey
=
"Distributions.Poisson"
fnames
=
(
fnames
=
(
...
@@ -113,7 +113,7 @@ function load_contact_time_distributions()
...
@@ -113,7 +113,7 @@ function load_contact_time_distributions()
)
)
contact_distributions_tuple
=
map
(
fnames
)
do
fname
contact_distributions_tuple
=
map
(
fnames
)
do
fname
dat
=
deserialize
(
joinpath
(
PACKAGE_FOLDER
,
"intervals_model_output"
,
"simulation_output"
,
"
$
fname.dat"
))
dat
=
deserialize
(
joinpath
(
PACKAGE_FOLDER
,
"intervals_model_output"
,
"simulation_output"
,
"
$
fname.dat"
))
return
map
(
p
->
make_sampler
(
mode
(
p
.
particles
)),
as_symmetric_matrix
(
dat
[
distkey
]
.
P
))
return
map
(
p
->
Poisson
(
mode
(
p
.
particles
)),
as_symmetric_matrix
(
dat
[
distkey
]
.
P
))
end
end
return
contact_distributions_tuple
return
contact_distributions_tuple
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment