guts-base 1.0.0__tar.gz → 1.0.1__tar.gz

{guts_base-1.0.0 → guts_base-1.0.1}/PKG-INFO

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

{guts_base-1.0.0 → guts_base-1.0.1}/guts_base/__init__.py

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

{guts_base-1.0.0 → guts_base-1.0.1}/guts_base/sim/ecx.py

@@ -51,12 +51,17 @@ class ECxEstimator:
         # original observations (especially time), except the ID, which is overwritten
         # and taken from the x_in dataset
         pseudo_obs = self.sim.observations.isel(id=[0])
-        pseudo_obs = pseudo_obs.drop(["exposure","survival"])
+        pseudo_obs = pseudo_obs.drop([v for v in pseudo_obs.data_vars.keys()])
         pseudo_obs["id"] = x_in["id"]
         
         self.sim.config.data_structure.survival.observed = False
         self.sim.observations = pseudo_obs
 
+        # overwrite x_in to make sure that parse_input takes x_in from exposure and
+        # does not use the string that is tied to another data variable which was
+        # originally present
+        self.sim.config.simulation.x_in = ["exposure=exposure"]
+
         # ensure correct coordinate order with x_in and raise errors early
         self.sim.model_parameters["x_in"] = self.sim.parse_input("x_in", x_in)
 
@@ -69,7 +74,7 @@ class ECxEstimator:
             self.sim.coordinates["time"], np.array(time, ndmin=1)
         ]))
 
-        self.sim.model_parameters["y0"] = self.sim.parse_input("y0", drop_dims="time")
+        self.sim.model_parameters["y0"] = self.sim.parse_input("y0", drop_dims=["time"])
         self.sim.dispatch_constructor()
 
         self.results = pd.Series({

{guts_base-1.0.0 → guts_base-1.0.1}/guts_base.egg-info/PKG-INFO

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

{guts_base-1.0.0 → guts_base-1.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "guts_base"
-version = "1.0.0"
+version = "1.0.1"
 authors = [
   { name="Florian Schunck", email="fluncki@protonmail.com" },
 ]
@@ -48,7 +48,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.0"
+current_version = "1.0.1"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 tag_message = "{new_version}"