diff --git a/PyCTBN/PyCTBN/structure_graph/trajectory_generator.py b/PyCTBN/PyCTBN/structure_graph/trajectory_generator.py index 769f4a7..6c7662a 100644 --- a/PyCTBN/PyCTBN/structure_graph/trajectory_generator.py +++ b/PyCTBN/PyCTBN/structure_graph/trajectory_generator.py @@ -11,7 +11,6 @@ from numpy import random class TrajectoryGenerator(object): def __init__(self, importer: AbstractImporter): self._importer = importer - self._importer.import_data(0) self._vnames = self._importer._df_variables.iloc[:, 0].to_list() @@ -19,6 +18,8 @@ class TrajectoryGenerator(object): for v in self._vnames: self._parents[v] = self._importer._df_structure.where(self._importer._df_structure["To"] == v).dropna()["From"].tolist() + print(self._parents) + self._cims = {} sampled_cims = self._importer._raw_data[0]["dyn.cims"] for v in sampled_cims.keys(): @@ -92,6 +93,9 @@ class TrajectoryGenerator(object): # undefine variable time time[next] = np.NaN + for i, v in enumerate(self._parents): + if self._vnames[next] in self._parents[v]: + time[i] = np.NaN def to_json(self): return json.loads(self._generated_trajectory.to_json(orient="records")) \ No newline at end of file