Commit 42678a7b authored by Georgios Dagkakis's avatar Georgios Dagkakis Committed by Jérome Perrin

RandomNumberGenerator to require distribution to be given as dictionary

parent 36d31dc0
...@@ -38,7 +38,10 @@ class RandomNumberGenerator(object): ...@@ -38,7 +38,10 @@ class RandomNumberGenerator(object):
# ... # ...
# }, # },
def __init__(self, obj, distribution): def __init__(self, obj, distribution):
# check in case an inknown distrbution was given # if the distribution is not given as a dictionary throw error
if not isinstance(distribution, dict):
raise ValueError("distribution must be given as a dict")
# check in case an unknown distribution was given
unknownDistribution=True unknownDistribution=True
for key in distribution.keys(): for key in distribution.keys():
if key in ['Fixed', 'Normal','Exp','Gamma','Logistic','Erlang', if key in ['Fixed', 'Normal','Exp','Gamma','Logistic','Erlang',
......
...@@ -67,7 +67,7 @@ class RandomNumberGeneratorTestCase(TestCase): ...@@ -67,7 +67,7 @@ class RandomNumberGeneratorTestCase(TestCase):
}) })
self.assertRaises(ValueError, rng.generateNumber) self.assertRaises(ValueError, rng.generateNumber)
def testUnkonwnDistribution(self): def testUnknownDistribution(self):
rng = RandomNumberGenerator(obj, distribution='Unknown') rng = RandomNumberGenerator(obj, distribution='Unknown')
self.assertRaises(ValueError, rng.generateNumber) self.assertRaises(ValueError, rng.generateNumber)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment