Commit 9340748

committed

FIX: Purge nx.to_numpy_matrix

1 parent 091811a commit 9340748Copy full SHA for 9340748

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -383,13 +383,13 @@ def cmat(`
`383`	`383`	`with open(op.abspath(matrix_name), 'wb') as f:`
`384`	`384`	`pickle.dump(G, f, pickle.HIGHEST_PROTOCOL)`
`385`	`385`
`386`		`- numfib_mlab = nx.to_numpy_matrix(numfib, dtype=int)`
	`386`	`+ numfib_mlab = nx.to_numpy_array(numfib, dtype=int)`
`387`	`387`	`numfib_dict = {"number_of_fibers": numfib_mlab}`
`388`		`- fibmean_mlab = nx.to_numpy_matrix(fibmean, dtype=np.float64)`
	`388`	`+ fibmean_mlab = nx.to_numpy_array(fibmean, dtype=np.float64)`
`389`	`389`	`fibmean_dict = {"mean_fiber_length": fibmean_mlab}`
`390`		`- fibmedian_mlab = nx.to_numpy_matrix(fibmedian, dtype=np.float64)`
	`390`	`+ fibmedian_mlab = nx.to_numpy_array(fibmedian, dtype=np.float64)`
`391`	`391`	`fibmedian_dict = {"median_fiber_length": fibmedian_mlab}`
`392`		`- fibdev_mlab = nx.to_numpy_matrix(fibdev, dtype=np.float64)`
	`392`	`+ fibdev_mlab = nx.to_numpy_array(fibdev, dtype=np.float64)`
`393`	`393`	`fibdev_dict = {"fiber_length_std": fibdev_mlab}`
`394`	`394`
`395`	`395`	`if intersections:`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ def ntwks_to_matrices(in_files, edge_key):`
`40`	`40`	`raise KeyError(`
`41`	`41`	`"the graph edges do not have {} attribute".format(edge_key)`
`42`	`42`	`)`
`43`		`- matrix[:, :, idx] = nx.to_numpy_matrix(graph) # Retrieve the matrix`
	`43`	`+ matrix[:, :, idx] = nx.to_numpy_array(graph) # Retrieve the matrix`
`44`	`44`	`return matrix`
`45`	`45`
`46`	`46`

Comments

(0)