From 854058a9d01b38e26c0204ef907b100fc67845a7 Mon Sep 17 00:00:00 2001 From: Joseph Lemaitre Date: Fri, 19 Apr 2024 12:51:44 +0200 Subject: [PATCH] fixes --- flepimop/gempyor_pkg/src/gempyor/initial_conditions.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/flepimop/gempyor_pkg/src/gempyor/initial_conditions.py b/flepimop/gempyor_pkg/src/gempyor/initial_conditions.py index 072286f7c..1a9114077 100644 --- a/flepimop/gempyor_pkg/src/gempyor/initial_conditions.py +++ b/flepimop/gempyor_pkg/src/gempyor/initial_conditions.py @@ -48,8 +48,8 @@ def get_from_config(self, sim_id: int, modinf) -> np.ndarray: if method == "SetInitialConditionsFolderDraw": ic_df = modinf.read_simID(ftype=self.initial_conditions_config["initial_file_type"], sim_id=sim_id) else: - ic_df = self.path_prefix / read_df( - self.initial_conditions_config["initial_conditions_file"].get(), + ic_df = read_df( + self.path_prefix / self.initial_conditions_config["initial_conditions_file"].get(), ) y0 = np.zeros((modinf.compartments.compartments.shape[0], modinf.nsubpops)) @@ -105,8 +105,7 @@ def get_from_config(self, sim_id: int, modinf) -> np.ndarray: if method == "InitialConditionsFolderDraw": ic_df = modinf.read_simID(ftype=self.initial_conditions_config["initial_file_type"].get(), sim_id=sim_id) elif method == "FromFile": - ic_df = self.path_prefix / read_df( - self.initial_conditions_config["initial_conditions_file"].get(), + ic_df = read_df(self.path_prefix / self.initial_conditions_config["initial_conditions_file"].get(), ) # annoying conversion because sometime the parquet columns get attributed a timezone...