From 38fe6e734e56168692479167960fc58d0c87c2d2 Mon Sep 17 00:00:00 2001 From: Phil Elson Date: Fri, 28 May 2021 17:23:43 +0200 Subject: [PATCH] Review actions for monte carlo models. --- cara/monte_carlo/sampleable.py | 6 +++--- cara/tests/test_monte_carlo.py | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cara/monte_carlo/sampleable.py b/cara/monte_carlo/sampleable.py index 6f53c43c..4ed49d82 100644 --- a/cara/monte_carlo/sampleable.py +++ b/cara/monte_carlo/sampleable.py @@ -16,12 +16,12 @@ class SampleableDistribution: class Normal(SampleableDistribution): - def __init__(self, mean: float, scale: float): + def __init__(self, mean: float, standard_deviation: float): self.mean = mean - self.scale = scale + self.standard_deviation = standard_deviation def generate_samples(self, size: int) -> float_array_size_n: - return np.random.normal(self.mean, self.scale, size=size) + return np.random.normal(self.mean, self.standard_deviation, size=size) _VectorisedFloatOrSampleable = typing.Union[ diff --git a/cara/tests/test_monte_carlo.py b/cara/tests/test_monte_carlo.py index 28f7dc28..f3d9fb08 100644 --- a/cara/tests/test_monte_carlo.py +++ b/cara/tests/test_monte_carlo.py @@ -1,5 +1,6 @@ import dataclasses +import numpy as np import pytest import cara.models @@ -81,3 +82,6 @@ def test_build_concentration_model(baseline_mc_model: cara.monte_carlo.Concentra def test_build_exposure_model(baseline_mc_exposure_model: cara.monte_carlo.ExposureModel): model = baseline_mc_exposure_model.build_model(7) assert isinstance(model, cara.models.ExposureModel) + prob = model.quanta_exposure() + assert isinstance(prob, np.ndarray) + assert prob.shape == (7, )