guts-base 1.0.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

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/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.dist-info → guts_base-1.0.1.dist-info}/METADATA

@@ -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.dist-info → guts_base-1.0.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-guts_base/__init__.py,sha256=ulUbdy3eks46Fl2VAVRRymWiAmzDOj_pqRCBpItSnMI,227
+guts_base/__init__.py,sha256=AqEsieZlFfc_SqQ4wN-pCXvqRCkjfF35TSOWiO_9hco,227
 guts_base/mod.py,sha256=AzOCg1A8FP5EtVfp-66HT7G7h_wnHkenieaxTc9qCyk,5796
 guts_base/plot.py,sha256=rjIzyPUikOtubjWI5mX_ZY8ARWl2NiHDmwAZAdoaPS8,5693
 guts_base/prob.py,sha256=ITwo5dAGMHr5xTldilHMbKU6AFsWo4_ZwbfaXh97Gew,5443
@@ -13,13 +13,13 @@ guts_base/data/utils.py,sha256=u3gGDJK15MfRUP4iIxsS-I1oqxD2qH_ugsT7o_Eac18,236
 guts_base/sim/__init__.py,sha256=5VgzsOXjMsylfWy4neeovZBG1w6G6p_tFaIfhnIeLPM,415
 guts_base/sim/base.py,sha256=7u7gj6HQSCtFUXrrX-ngfWsWnFEMk5NrDVJH0CIolAs,28960
 guts_base/sim/constructors.py,sha256=Kz9FHIH3EHsSIKd9sQgHa3eveniFifFlk1Hf-QR69Pg,875
-guts_base/sim/ecx.py,sha256=F2ImQbtJjP57udebY2c_vtOf4gB3yKSje0P8s9VIbtQ,18858
+guts_base/sim/ecx.py,sha256=peO93pKcQwF5eULo5BdUl4KLnXzrTfvRGI8qsbAYQKU,19137
 guts_base/sim/mempy.py,sha256=IHd87UrmdXpC7y7q0IjYQJH075frjbp2a-dMVBeqZ0U,10164
 guts_base/sim/report.py,sha256=swTAp1qNTjDwWh-YOq_TLqtSxjQvjdwaNVHpEW8kXK4,1959
 guts_base/sim/utils.py,sha256=Qj_FPH6kywVxOwgCerS7w5CyuYR9HKmvBWFpmxwDFgk,256
-guts_base-1.0.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-guts_base-1.0.0.dist-info/METADATA,sha256=g8sJM482NTXEGv7dJKbLVujO_sRzkpg3fuHadmDMdhc,45406
-guts_base-1.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-guts_base-1.0.0.dist-info/entry_points.txt,sha256=icsHzG2jQ90ZS7XvLsI5Qj0-qGuPv2T0RBVN5daGCPU,183
-guts_base-1.0.0.dist-info/top_level.txt,sha256=PxhBgUd4r39W_VI4FyJjARwKbV5_glgCVnd6v_zAGdE,10
-guts_base-1.0.0.dist-info/RECORD,,
+guts_base-1.0.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+guts_base-1.0.1.dist-info/METADATA,sha256=vYcnGPbbGHEu-1yfF_OWliNRkQ4Ly3IDDK9Khs1DlCc,45406
+guts_base-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+guts_base-1.0.1.dist-info/entry_points.txt,sha256=icsHzG2jQ90ZS7XvLsI5Qj0-qGuPv2T0RBVN5daGCPU,183
+guts_base-1.0.1.dist-info/top_level.txt,sha256=PxhBgUd4r39W_VI4FyJjARwKbV5_glgCVnd6v_zAGdE,10
+guts_base-1.0.1.dist-info/RECORD,,