guts-base 1.0.7__py3-none-any.whl → 1.0.9__py3-none-any.whl

guts_base/__init__.py

@@ -4,7 +4,7 @@ from . import data
 from . import prob
 from . import plot
 
-__version__ = "1.0.7"
+__version__ = "1.0.9"
 
 from .sim import (
     GutsBase,

guts_base/sim/base.py

@@ -103,6 +103,8 @@ class GutsBase(SimulationBase):
         self.unit_time: Literal["day", "hour", "minute", "second"] = "day"
         if hasattr(self.config.simulation, "unit_time"):
             self.unit_time = self.config.simulation.unit_time  # type: ignore
+        else:
+            self.config.simulation.unit_time = self.unit_time
 
         if hasattr(self.config.simulation, "skip_data_processing"):
             self._skip_data_processing = not (
@@ -508,7 +510,7 @@ class GutsBase(SimulationBase):
                 )
 
                 scenarios.update({
-                    f"1day_exposure_{coord}": scenario
+                    f"{_name}_{coord}": scenario
                 })
 
         return scenarios

guts_base/sim/report.py

@@ -23,12 +23,13 @@ class GutsReport(Report):
     table_parameter_stat_focus = "mean"
     units = xr.Dataset({
         "metric": ["unit"],
-        "k_d": ("metric", ["1/t"])
+        "k_d": ("metric", ["1/T"])
     })
 
 
     def additional_reports(self, sim: "SimulationBase"):
         super().additional_reports(sim=sim)
+        self.model_input(sim)
         self.model_fits(sim)
         self.LCx_estimates(sim)
 
@@ -246,6 +247,7 @@ def flatten_coords(dataset: xr.Dataset, keep_dims):
     producing a array with harmonized dimensions
     """
     ds = dataset.copy()
+    ds = ds.reset_coords(drop=True)
     for var_name, data_var in ds.data_vars.items():
         extra_coords = [k for k in list(data_var.coords.keys()) if k not in keep_dims]
         if len(extra_coords) == 0:
@@ -325,18 +327,18 @@ class ParameterConverter:
         results_copy = sim_copy.evaluate(parameters=sim_copy.config.model_parameters.value_dict)
         results_orig = sim_orig.evaluate(parameters=sim_orig.config.model_parameters.value_dict)
 
-        np.testing.assert_allclose(results_copy.H, results_orig.H, atol=0.001, rtol=0.001)
+        np.testing.assert_allclose(results_copy.H, results_orig.H, atol=0.1, rtol=0.05)
 
     @staticmethod
     def validate_parameter_conversion_posterior_mean(sim_copy, sim_orig):
         results_copy = sim_copy.evaluate(parameters=sim_copy.point_estimate("mean", to="dict"))
         results_orig = sim_orig.evaluate(parameters=sim_orig.point_estimate("mean", to="dict"))
 
-        np.testing.assert_allclose(results_copy.H, results_orig.H, atol=0.001, rtol=0.001)
+        np.testing.assert_allclose(results_copy.H, results_orig.H, atol=0.1, rtol=0.05)
 
     @staticmethod
     def validate_parameter_conversion_posterior_map(sim_copy, sim_orig):
         results_copy = sim_copy.evaluate(parameters=sim_copy.point_estimate("map", to="dict"))
         results_orig = sim_orig.evaluate(parameters=sim_orig.point_estimate("map", to="dict"))
 
-        np.testing.assert_allclose(results_copy.H, results_orig.H, atol=0.001, rtol=0.001)
+        np.testing.assert_allclose(results_copy.H, results_orig.H, atol=0.1, rtol=0.05)

{guts_base-1.0.7.dist-info → guts_base-1.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: guts_base
-Version: 1.0.7
+Version: 1.0.9
 Summary: Basic GUTS model implementation in pymob
 Author-email: Florian Schunck <fluncki@protonmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{guts_base-1.0.7.dist-info → guts_base-1.0.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-guts_base/__init__.py,sha256=W9LH6glLwockPYaR5rX90_p39kfNP3de363E83g-5es,227
+guts_base/__init__.py,sha256=RW-pk7yhci5F8jUvWo4m7tBFyLtXxr8zGwGdFS95_6Q,227
 guts_base/mod.py,sha256=AzOCg1A8FP5EtVfp-66HT7G7h_wnHkenieaxTc9qCyk,5796
 guts_base/plot.py,sha256=Sr_d0sXHNajPLPelcGl72yCOEEqB7NGNWhViKYAiTng,6692
 guts_base/prob.py,sha256=ITwo5dAGMHr5xTldilHMbKU6AFsWo4_ZwbfaXh97Gew,5443
@@ -11,15 +11,15 @@ guts_base/data/survival.py,sha256=U-Ehloo8vnD81VeIglXLEUHX9lt7SjtEs2YEB0D9FHE,50
 guts_base/data/time_of_death.py,sha256=dHG5jhK--WkemTxJtHVgfdo-FWlFHslBQ0PcYape9fI,22296
 guts_base/data/utils.py,sha256=u3gGDJK15MfRUP4iIxsS-I1oqxD2qH_ugsT7o_Eac18,236
 guts_base/sim/__init__.py,sha256=sbHmT1p2saN0MJ-iYnCDOHjkHtTcKgm7X-dHX5o0tYA,435
-guts_base/sim/base.py,sha256=PJhBFzbs7TB2ewjE2myhEQNvcDBG4DXDols4qamhoYI,38040
+guts_base/sim/base.py,sha256=eMhdkdSit0aa0JbpfwVD_8E03-ooiFDI4UA9bAmC3j8,38110
 guts_base/sim/constructors.py,sha256=Kz9FHIH3EHsSIKd9sQgHa3eveniFifFlk1Hf-QR69Pg,875
 guts_base/sim/ecx.py,sha256=PeX8UVF1HMMNHaIU-jL6dml4JGezhWwiGSqPFJbOFM4,20808
 guts_base/sim/mempy.py,sha256=IHd87UrmdXpC7y7q0IjYQJH075frjbp2a-dMVBeqZ0U,10164
-guts_base/sim/report.py,sha256=o19MBhKcwty2auPjYWoz4QY91jjJFkA80UTzUuZo1oE,12720
+guts_base/sim/report.py,sha256=spjq_2Qcie2ZeSAAjaQ9YuBXLzYXWaVny7a3fSc1ZiI,12777
 guts_base/sim/utils.py,sha256=Qj_FPH6kywVxOwgCerS7w5CyuYR9HKmvBWFpmxwDFgk,256
-guts_base-1.0.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-guts_base-1.0.7.dist-info/METADATA,sha256=JlsmLRB8h8yzgCUIVNxSRQulFm2bM8cNCNytGziFKjg,45426
-guts_base-1.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-guts_base-1.0.7.dist-info/entry_points.txt,sha256=icsHzG2jQ90ZS7XvLsI5Qj0-qGuPv2T0RBVN5daGCPU,183
-guts_base-1.0.7.dist-info/top_level.txt,sha256=PxhBgUd4r39W_VI4FyJjARwKbV5_glgCVnd6v_zAGdE,10
-guts_base-1.0.7.dist-info/RECORD,,
+guts_base-1.0.9.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+guts_base-1.0.9.dist-info/METADATA,sha256=tZe-tFE8F6AStNqjiVL-msOxSh8fdYaT1jUpzf2v2MI,45426
+guts_base-1.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+guts_base-1.0.9.dist-info/entry_points.txt,sha256=icsHzG2jQ90ZS7XvLsI5Qj0-qGuPv2T0RBVN5daGCPU,183
+guts_base-1.0.9.dist-info/top_level.txt,sha256=PxhBgUd4r39W_VI4FyJjARwKbV5_glgCVnd6v_zAGdE,10
+guts_base-1.0.9.dist-info/RECORD,,