mirror of
https://github.com/gsi-upm/soil
synced 2025-08-24 03:52:20 +00:00
Clean-up
* Removed old/unnecessary models * Added a `simulation.{iter_}from_py` method to load simulations from python files * Changed tests of examples to run programmatic simulations * Fixed programmatic examples
This commit is contained in:
@@ -216,13 +216,13 @@
|
||||
" @soil.agents.state\n",
|
||||
" def neutral(self):\n",
|
||||
" r = random.random()\n",
|
||||
" if self['has_tv'] and r < self.env['prob_tv_spread']:\n",
|
||||
" if self['has_tv'] and r < self.model['prob_tv_spread']:\n",
|
||||
" return self.infected\n",
|
||||
" return\n",
|
||||
" \n",
|
||||
" @soil.agents.state\n",
|
||||
" def infected(self):\n",
|
||||
" prob_infect = self.env['prob_neighbor_spread']\n",
|
||||
" prob_infect = self.model['prob_neighbor_spread']\n",
|
||||
" for neighbor in self.get_neighboring_agents(state_id=self.neutral.id):\n",
|
||||
" r = random.random()\n",
|
||||
" if r < prob_infect:\n",
|
||||
@@ -271,11 +271,11 @@
|
||||
"class NewsEnvironmentAgent(soil.agents.NetworkAgent):\n",
|
||||
" def step(self):\n",
|
||||
" if self.now == self['event_time']:\n",
|
||||
" self.env['prob_tv_spread'] = 1\n",
|
||||
" self.env['prob_neighbor_spread'] = 1\n",
|
||||
" self.model['prob_tv_spread'] = 1\n",
|
||||
" self.model['prob_neighbor_spread'] = 1\n",
|
||||
" elif self.now > self['event_time']:\n",
|
||||
" self.env['prob_tv_spread'] = self.env['prob_tv_spread'] * TV_FACTOR\n",
|
||||
" self.env['prob_neighbor_spread'] = self.env['prob_neighbor_spread'] * NEIGHBOR_FACTOR"
|
||||
" self.model['prob_tv_spread'] = self.model['prob_tv_spread'] * TV_FACTOR\n",
|
||||
" self.model['prob_neighbor_spread'] = self.model['prob_neighbor_spread'] * NEIGHBOR_FACTOR"
|
||||
]
|
||||
},
|
||||
{
|
||||
|
Reference in New Issue
Block a user