Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3987bbf

Browse files
richardreeverichardreeve
authoredApr 19, 2021
Merge 37b7178 into 6aafff2 
2 parents 6aafff2 + 37b7178 commit 3987bbf

File tree

4 files changed

+46
-42
lines changed

4 files changed

+46
-42
lines changed
 

Diff for: ‎.github/workflows/CompatHelper.yaml

+14-10
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
julia-version:
17-
- '1.6'
17+
- '1'
1818
arch:
1919
- x86
2020
os:
@@ -24,15 +24,19 @@ jobs:
2424
with:
2525
version: ${{ matrix.julia-version }}
2626
arch: ${{ matrix.arch }}
27-
- name: Pkg.add("CompatHelper")
27+
- name: "Install CompatHelper"
2828
run: |
29-
julia -e '
30-
using Pkg
31-
Pkg.add("CompatHelper")'
32-
- name: CompatHelper.main()
29+
import Pkg
30+
name = "CompatHelper"
31+
uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
32+
version = "2"
33+
Pkg.add(; name, uuid, version)
34+
shell: julia --color=yes {0}
35+
- name: "Run CompatHelper"
36+
run: |
37+
import CompatHelper
38+
CompatHelper.main()
39+
shell: julia --color=yes {0}
3340
env:
3441
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35-
run: |
36-
julia -e '
37-
using CompatHelper
38-
CompatHelper.main()'
42+
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}

Diff for: ‎.github/workflows/docs.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818
- name: Set up julia
1919
uses: julia-actions/setup-julia@v1
2020
with:
21-
version: '1.6'
21+
version: '1'
2222
arch: x64
2323
- name: Install dependencies
2424
run: |
25-
julia --project=docs/ -e '
26-
using Pkg
27-
Pkg.develop(PackageSpec(path=pwd()))
25+
import Pkg
26+
Pkg.develop(Pkg.PackageSpec(path=pwd()))
2827
Pkg.instantiate()
29-
Pkg.add("Documenter")'
28+
Pkg.add("Documenter")
29+
shell: julia --project=docs/ --color=yes {0}
3030
- name: Build and deploy
3131
run: |
3232
julia --project=docs/ --color=yes docs/make.jl

Diff for: ‎.github/workflows/testing.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
pull_request:
1111

1212
jobs:
13-
simulation-tests:
13+
EcoSISTEM-tests:
1414
runs-on: ${{ matrix.os }}
1515
continue-on-error: ${{ matrix.experimental }}
1616
strategy:

Diff for: ‎docs/src/simulation-jl.md

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
**Table of datasets currently in use by EcoSISTEM.jl**
1+
# Datasets currently in use by EcoSISTEM.jl
22

33
Preliminary list of parameters/datasets.
44

5-
| Name of parameter/ dataset | Description | Value | Source | Other info (e.g. stability) |
5+
| Name of parameter / dataset | Description | Value | Source | Other info (e.g. stability) |
66
|----------------------------|-------------|-------|--------|-----------------------------|
7-
| p_s | Probability of developing symptoms | 0.96 | http://gabgoh.github.io/COVID/index.html (From Thibaud's original model) | |
8-
| p_h | Probability of hospitalisation | 0.2 | Guess | |
9-
| cfr_home | Case fatality ratio (at home) | 0.1 | Guess | |
10-
| cfr_hospital | Case fatality ratio (at hospital) | 0.1 | Guess | |
11-
| T_lat | Latent period | 5 days | http://gabgoh.github.io/COVID/index.html (From Thibaud's original model) | |
12-
| T_asym | Asymptomatic period | 3 days | http://gabgoh.github.io/COVID/index.html (From Thibaud's original model) | |
13-
| T_sym | Symptomatic period | 5 days | http://gabgoh.github.io/COVID/index.html (From Thibaud's original model) | |
14-
| T_hosp | Hospitalisation period | 5 days | https://www.icnarc.org/Our-Audit/Audits/Cmp/Reports (From Thibaud's original model) | |
15-
| T_rec | Recovery period | 11 days | http://gabgoh.github.io/COVID/index.html (From Thibaud's original model) | |
16-
| mu_1 | Probability of becoming Asymptomatic | 1/T_lat | | |
17-
| mu_2 | Probability of becoming Symptomatic | p_s * 1/T_asym | | |
18-
| hospitalisation | Probability of becoming Hospitalised | p_h * 1/T_sym | | |
19-
| sigma_1 | Probability of Recovery from Asymptomatic | (1 - p_s) * 1/T_asym | | |
20-
| sigma_2 | Probability of Recovery from Symptomatic | (1 - p_h) * (1 - cfr_home) * 1/T_rec | | |
21-
| sigma_hospital | Probability of Recovery from Hospital | (1 - cfr_hosp) * 1/T_hosp | | |
22-
| death_home | Probability of Death at home | cfr_home * 2/T_hosp | | |
23-
| death_hospital | Probability of Death at hospital | cfr_hosp * 1/T_hosp | | |
7+
| p_s | Probability of developing symptoms | 0.96 | [From Thibaud's original model](http://gabgoh.github.io/COVID/index.html) | |
8+
| p\_h | Probability of hospitalisation | 0.2 | Guess | |
9+
| cfr\_home | Case fatality ratio (at home) | 0.1 | Guess | |
10+
| cfr\_hospital | Case fatality ratio (at hospital) | 0.1 | Guess | |
11+
| T\_lat | Latent period | 5 days | [From Thibaud's original model](http://gabgoh.github.io/COVID/index.html) | |
12+
| T\_asym | Asymptomatic period | 3 days | [From Thibaud's original model](http://gabgoh.github.io/COVID/index.html) | |
13+
| T_sym | Symptomatic period | 5 days | [From Thibaud's original model](http://gabgoh.github.io/COVID/index.html) | |
14+
| T\_hosp | Hospitalisation period | 5 days | [From Thibaud's original model](https://www.icnarc.org/Our-Audit/Audits/Cmp/Reports) | |
15+
| T\_rec | Recovery period | 11 days | [From Thibaud's original model](http://gabgoh.github.io/COVID/index.html) | |
16+
| mu\_1 | Probability of becoming Asymptomatic | 1/T\_lat | | |
17+
| mu\_2 | Probability of becoming Symptomatic | p\_s \* 1/T\_asym | | |
18+
| hospitalisation | Probability of becoming Hospitalised | p\_h \* 1/T\_sym | | |
19+
| sigma\_1 | Probability of Recovery from Asymptomatic | (1 - p\_s) * 1/T\_asym | | |
20+
| sigma\_2 | Probability of Recovery from Symptomatic | (1 - p\_h) \* (1 - cfr\_home) * 1/T\_rec | | |
21+
| sigma_hospital | Probability of Recovery from Hospital | (1 - cfr_hosp) \* 1/T\_hosp | | |
22+
| death_home | Probability of Death at home | cfr\_home \* 2/T\_hosp | | |
23+
| death_hospital | Probability of Death at hospital | cfr\_hosp \* 1/T\_hosp | | |
2424
| ScotlandDensity2011 | Scottish population density at 1km grid | | UK census 2011 - A Reeves 'Covid19-ScottishCensusData' repo | |
25-
| dispersal_dist | Average dispersal distance of virus per disease category | 2.0km per infectious disease category | Guess | Varies depending on grid size |
26-
| mean_pref | Mean temperature preference of virus | 298K | Guess | Currently tuned to fit environment perfectly |
27-
| var_pref | Temperature niche width of virus | 0.1K | Guess | Currently tuned to fit environment perfectly |
25+
| dispersal\_dist | Average dispersal distance of virus per disease category | 2.0km per infectious disease category | Guess | Varies depending on grid size |
26+
| mean\_pref | Mean temperature preference of virus | 298K | Guess | Currently tuned to fit environment perfectly |
27+
| var\_pref | Temperature niche width of virus | 0.1K | Guess | Currently tuned to fit environment perfectly |
2828
| birth | Probability of giving birth per individual | 1.3e-4/day (20-40 year olds), 0 otherwise | Guess | |
2929
| death | Probability of giving natural mortality per individual | 2.7e-5/day | Guess | |
30-
| virus_growth_asymp | Rate of generating virus per asymptomatic individual | 0.1/day | Guess | |
31-
| virus_growth_symp | Rate of generating virus per symptomatic individual | 0.1/day | Guess | |
32-
| beta_force | Force of infection | 10.0/day | Guess | |
33-
| beta_env | Environmental transmission | 10.0/day | Guess | |
30+
| virus\_growth\_asymp | Rate of generating virus per asymptomatic individual | 0.1/day | Guess | |
31+
| virus\_growth\_symp | Rate of generating virus per symptomatic individual | 0.1/day | Guess | |
32+
| beta\_force | Force of infection | 10.0/day | Guess | |
33+
| beta\_env | Environmental transmission | 10.0/day | Guess | |

0 commit comments

Comments
 (0)
Please sign in to comment.