Merge remote-tracking branch 'origin/dev' into dev

climate_health/datatypes.py

@@ -1,15 +1,15 @@
 import bionumpy as bnp
 
 
-@bnp.bnpdataclass
+@bnp.bnpdataclass.bnpdataclass
 class ClimateHealthTimeSeries:
     time_period: str
     rainfall: float
     mean_temperature: float
     disease_cases: int
 
 
-@bnp.bnpdataclass
+@bnp.bnpdataclass.bnpdataclass
 class LocatedClimateHealthTimeSeries(ClimateHealthTimeSeries):
     time_period: str
     rainfall: float

climate_health/simulation/random_noise_simulator.py

@@ -1,5 +1,6 @@
 from climate_health.datatypes import ClimateHealthTimeSeries
 import numpy as np
+from climate_health.simulation.simulator import Simulator
 
 
 class RandomNoiseSimulator(Simulator):
@@ -13,7 +14,8 @@ def __init__(self, n_time_points: int):
     def simulate(self) -> ClimateHealthTimeSeries:
         """Simulate the model for the given parameters."""
         return ClimateHealthTimeSeries(
-            time_period=[],
+            time_period=[str(i) for i in range(self.n_time_points)],
             rainfall=np.random.randn(self.n_time_points),
-            mean_temperature=[]
+            mean_temperature=np.random.randn(self.n_time_points),
+            disease_cases=np.random.poisson(10, self.n_time_points)
         )

climate_health/simulation/simulator.py

@@ -11,5 +11,5 @@ def simulate(self) -> ClimateHealthTimeSeries:
         """Simulate the model for the given parameters."""
         ...
 
-class RandomNoise
+
 

tests/simulation/test_random_noise_simulator.py

@@ -0,0 +1,9 @@
+from climate_health.datatypes import ClimateHealthTimeSeries
+from climate_health.simulation.random_noise_simulator import RandomNoiseSimulator
+
+
+def test_random_noise_simulator():
+    my_simulator = RandomNoiseSimulator(10)
+    data = my_simulator.simulate()
+    assert len(data.time_period) == 10
+    assert isinstance(data, ClimateHealthTimeSeries)