diff --git a/main_package/classes/amalgamated_cims.py b/main_package/classes/amalgamated_cims.py index e5968dd..169a571 100644 --- a/main_package/classes/amalgamated_cims.py +++ b/main_package/classes/amalgamated_cims.py @@ -12,9 +12,9 @@ class AmalgamatedCims: def init_cims_structure(self, keys, dims): for key, dim in (keys, dims): self.actual_cims[key] = np.empty(dim, dtype=cim.ConditionalIntensityMatrix) - for block_matrix in self.actual_cims.values(): - for matrix in block_matrix: - matrix = cim.ConditionalIntensityMatrix(self.states_per_variable) + for key in self.actual_cims.keys(): + for indx in range(len(self.actual_cims[key])): + self.actual_cims[key][indx] = cim.ConditionalIntensityMatrix(self.states_per_variable) def compute_matrix_indx(self, row, col): return self.state_per_variable * row + col diff --git a/main_package/classes/network_graph.py b/main_package/classes/network_graph.py index 029c09b..5ac9387 100644 --- a/main_package/classes/network_graph.py +++ b/main_package/classes/network_graph.py @@ -21,7 +21,6 @@ class NetworkGraph(): def init_graph(self): self.sample_path.build_trajectories() self.sample_path.build_structure() - print(self.sample_path.structure.list_of_edges()) self.add_edges(self.sample_path.structure.list_of_edges()) def add_edges(self, list_of_edges): @@ -40,4 +39,4 @@ s1 = sp.SamplePath(path) g1 = NetworkGraph(s1) g1.init_graph() -print(g1.graph) +