Merge remote-tracking branch 'origin/master'

GiulioRossetti · Jun 19, 2019 · 1be34ac · 1be34ac
2 parents e5a9fa7 + 01d5496
commit 1be34ac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
@@ -56,7 +56,8 @@ Each model has its own parameters: in order to completely instantiate the simula
 
 The model configuration allows to specify model parameters (as in this scenario) as well as nodes' and edges' ones (e.g.  individual thresholds).
 
-Moreover it allows to specify the initial percentage of infected nodes using the ``fraction_infected`` model parameter.
+Moreover it allows to specify the initial fraction of infected nodes using the 
+``fraction_infected`` model parameter.
 
 It is also possible to explicitly specify an initial set of infected nodes: see :ref:`model_conf` for the complete set of use cases.
 

diff --git a/ndlib/models/epidemics/SIRModel.py b/ndlib/models/epidemics/SIRModel.py
@@ -90,7 +90,7 @@ def iteration(self, node_status=True):
                 else:
                     if eventp < self.params['model']['beta'] * triggered:
                         actual_status[u] = 1
-
+                        
             elif u_status == 1:
                 if eventp < self.params['model']['gamma']:
                     actual_status[u] = 2

diff --git a/requirements.txt b/requirements.txt
@@ -6,4 +6,4 @@ networkx==2.3
 dynetx==0.2.2
 bokeh==1.2.0
 matplotlib==3.0.3
-pytest==4.5.0
+pytest==4.6.3