From 3d94a3aedc5ffe87dd892282c49f711ffb53f573 Mon Sep 17 00:00:00 2001 From: Steven Date: Sun, 29 Mar 2020 20:13:19 +0100 Subject: [PATCH] merging david's changes --- scenarios/ebola/both_run.in | 2 +- scenarios/ebola/both_setup.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scenarios/ebola/both_run.in b/scenarios/ebola/both_run.in index fb2befc..a32fc02 100755 --- a/scenarios/ebola/both_run.in +++ b/scenarios/ebola/both_run.in @@ -61,7 +61,7 @@ [Contact tracing and vaccination] Start_Time_Contact_Tracing 1 999 - Start_Time_Self_Isolation 1 999 + Start_Time_Self_Isolation 1 999g Vaccine_Probability_Susceptible 1 0.95 Latent_Vaccinated_One_Minimum_Time 1 5 Latent_Vaccinated_One_Maximum_Time 1 7 diff --git a/scenarios/ebola/both_setup.in b/scenarios/ebola/both_setup.in index fc1b872..d3ea990 100755 --- a/scenarios/ebola/both_setup.in +++ b/scenarios/ebola/both_setup.in @@ -2,7 +2,7 @@ dblHexagonWidth 1 0.001 [radians] intNoMaximalNodes 1 1 dblMaxSpatialNeighbours 1 100 - blNetworkDumpFile 0 FALSE + blNetworkDumpFile 0 TRUE intBlockSizeInUnitsOfPointers 1 4096 [Household setup] @@ -13,7 +13,7 @@ [Workplace setup] dblPropColleguesInNetwork 1 0.1 dblAverageWorkplaceSize 1 1000 - strWorkplaceDensityFile 0 ../../data/bikoroSmallAscii.asc [../data/Uniform_0_to_199] + strWorkplaceDensityFile 0 ../../data/bikoroSmallAscii.asc [../data/Uniform_0_to_199] dblDistanceAllWorkplacesHistDx 1 10 dblDistanceAllWorkplacesGridDx 1 5 intMCMCMaxSamplesInMillions 1 0