guts-base 1.0.7__tar.gz → 1.0.9__tar.gz

{guts_base-1.0.7 → guts_base-1.0.9}/PKG-INFO

@@ -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 → guts_base-1.0.9}/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-1.0.7 → guts_base-1.0.9}/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-1.0.7 → guts_base-1.0.9}/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 → guts_base-1.0.9}/guts_base.egg-info/PKG-INFO

@@ -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 → guts_base-1.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "guts_base"
-version = "1.0.7"
+version = "1.0.9"
 authors = [
   { name="Florian Schunck", email="fluncki@protonmail.com" },
 ]
@@ -49,7 +49,7 @@ import-openguts = "guts_base.data.openguts:create_database_and_import_data"
 convert-time-of-death-to-openguts = "guts_base.data.time_of_death:time_of_death_to_openguts"
 
 [tool.bumpver]
-current_version = "1.0.7"
+current_version = "1.0.9"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 tag_message = "{new_version}"