diff --git a/netZooPy/condor/condor.py b/netZooPy/condor/condor.py index 0e755bd9..4fad8764 100644 --- a/netZooPy/condor/condor.py +++ b/netZooPy/condor/condor.py @@ -305,7 +305,7 @@ def matrices(self, c,resolution): # Computes weighted biadjacency matrix. A = np.matrix(np.zeros((p, q))) for edge in self.net.iterrows(): - A[gn[edge[1][1]], rg[edge[1][0]]] = edge[1][2] + A[gn[edge[1].iloc[1]], rg[edge[1].iloc[0]]] = edge[1].iloc[2] # Computes node degrees for the nodesets. ki = A.sum(1) diff --git a/tests/test_cobra.py b/tests/test_cobra.py index 2fe940fc..e4eb4a53 100644 --- a/tests/test_cobra.py +++ b/tests/test_cobra.py @@ -38,6 +38,6 @@ def test_cobra(): q = psi.shape[0] for i in range(q): - C = Q.to_numpy().dot(np.mean(X, axis=0)[i] * np.diag(psi.to_numpy()[i, :])).dot(Q.to_numpy().T) - C_gt = Q_gt.to_numpy().dot(np.mean(X, axis=0)[i] * np.diag(psi_gt.to_numpy()[i, :])).dot(Q_gt.to_numpy().T) + C = Q.to_numpy().dot(np.mean(X, axis=0).iloc[i] * np.diag(psi.to_numpy()[i, :])).dot(Q.to_numpy().T) + C_gt = Q_gt.to_numpy().dot(np.mean(X, axis=0).iloc[i] * np.diag(psi_gt.to_numpy()[i, :])).dot(Q_gt.to_numpy().T) pd.testing.assert_frame_equal(pd.DataFrame(C), pd.DataFrame(C_gt), rtol=1e-10, check_exact=False)