diff --git a/config.yml b/config.yml index 023d992..058995e 100644 --- a/config.yml +++ b/config.yml @@ -17,3 +17,6 @@ reportInterval: 10 nr_step_size : 300 nr_day_to_simulate : 49 pathfindFileName: pathfind.csv +flatInfectionRate: 0.2 +roadInfectionRate: 0.632 +offMapInfectionRate: 0.1 diff --git a/lib/Simulation/BasicInfectionModel.py b/lib/Simulation/BasicInfectionModel.py index a199f7d..bc75b9f 100644 --- a/lib/Simulation/BasicInfectionModel.py +++ b/lib/Simulation/BasicInfectionModel.py @@ -118,7 +118,7 @@ def _distanceBasedInfection(self,agent, infectiousAgents, stepSize, timeStamp): - stepSize = [int] the step length - timeStamp = [TimeStamp] current timestamp """ - gradient = 0.05 - self.roadInfectionRate / 2.0 + gradient = 0.01 - self.roadInfectionRate / 1.5 for stranger in infectiousAgents: distance = stranger.currentLocation.calculateDistance(agent.currentLocation) infectionProbability = ((gradient* distance) + self.roadInfectionRate)/(24 * 3600/ stepSize)