Skip to content

Commit

Permalink
⬆️ backward compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
GiulioRossetti committed Jun 22, 2019
1 parent c9099aa commit 53cbef3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion ndlib/models/DiffusionModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ def __validate_configuration(self, configuration):

# Checking initial simulation status
sts = set(configuration.get_model_configuration().keys())
if self.discrete_state and "Infected" not in sts and "fraction_infected" not in mdp:
if self.discrete_state and "Infected" not in sts and "fraction_infected" not in mdp \
and "percentage_infected" not in mdp:
warnings.warn('Initial infection missing: a random sample of 5% of graph nodes will be set as infected')
self.params['model']["fraction_infected"] = 0.05

Expand Down Expand Up @@ -155,6 +156,8 @@ def set_initial_status(self, configuration):

# Handle initial infection
if 'Infected' not in self.params['status']:
if 'percentage_infected' in self.params['model']:
self.params['model']['fraction_infected'] = self.params['model']['percentage_infected']
if 'fraction_infected' in self.params['model']:
number_of_initial_infected = len(self.graph.nodes()) * float(self.params['model']['fraction_infected'])
if number_of_initial_infected < 1:
Expand Down Expand Up @@ -219,6 +222,8 @@ def reset(self, infected_nodes=None):
self.initial_status = self.status

else:
if 'percentage_infected' in self.params['model']:
self.params['model']['fraction_infected'] = self.params['model']['percentage_infected']
if 'fraction_infected' in self.params['model']:
for n in self.status:
self.status[n] = 0
Expand Down
2 changes: 1 addition & 1 deletion ndlib/test/test_ndlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def test_sir_model(self):
config = mc.Configuration()
config.add_model_parameter('beta', 0.5)
config.add_model_parameter('gamma', 0.2)
config.add_model_parameter("fraction_infected", 0.1)
config.add_model_parameter("percentage_infected", 0.1)
model.set_initial_status(config)
iterations = model.iteration_bunch(10)
self.assertEqual(len(iterations), 10)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


setup(name='ndlib',
version='4.0.2',
version='5.0.0',
license='BSD-Clause-2',
description='Network Diffusion Library',
url='https://github.com/GiulioRossetti/ndlib',
Expand Down

0 comments on commit 53cbef3

Please sign in to comment.