From b5f2022b3ae1ed72b943c4d0c8241aed6533eaf1 Mon Sep 17 00:00:00 2001 From: Ioannis Valasakis Date: Sun, 19 Jun 2022 07:54:31 +0100 Subject: [PATCH 1/2] Change scipy import to new versions --- nigraph/metrics/static.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nigraph/metrics/static.py b/nigraph/metrics/static.py index 620edd9..a84a303 100755 --- a/nigraph/metrics/static.py +++ b/nigraph/metrics/static.py @@ -70,8 +70,8 @@ from numpy.random import binomial from copy import deepcopy -from sklearn.utils import graph_shortest_path as skl_graph -from sklearn.utils.graph import connected_components as cs_graph_components +import scipy.sparse.csgraph as skl_graph +from scipy.sparse.csgraph import connected_components as cs_graph_components from ..utilities import convert_to_graph, inverse_adj, subgraph, \ remove_nodes, make_undirected From 3283e68498c4d8ebdddc58eb4f812d2faed69f79 Mon Sep 17 00:00:00 2001 From: Ioannis Valasakis Date: Sun, 19 Jun 2022 07:57:04 +0100 Subject: [PATCH 2/2] Add parentheses to the print statements --- nigraph/metrics/static.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nigraph/metrics/static.py b/nigraph/metrics/static.py index a84a303..fb0f39d 100755 --- a/nigraph/metrics/static.py +++ b/nigraph/metrics/static.py @@ -3044,12 +3044,12 @@ def _run_network(): visit_times = np.zeros((n_iter, n_nodes)) for iter in range(n_iter): if verbose: - print ' #iter %s // %s' % (iter + 1, n_iter) + print(' #iter %s // %s' % (iter + 1, n_iter)) visit_time = _run_network() visit_times[iter] = visit_time if verbose: - print '--time', (time.time()-t0)/60. + print('--time', (time.time()-t0)/60.) return np.mean(visit_times, axis=0), visit_times @@ -3057,16 +3057,16 @@ def _run_network(): visit_times = np.zeros(n_nodes) for iter in range(n_iter): if verbose: - print ' #iter %s // %s' % (iter + 1, n_iter) + print(' #iter %s // %s' % (iter + 1, n_iter)) visit_time = _run_network() if visit_time[visit_time < 0].size > 0: - print 'warning: not all nodes were visited, \ - consider increasing n_steps' + print('warning: not all nodes were visited, \ + consider increasing n_steps') visit_times += visit_time visit_times /= float(n_iter) if verbose: - print '--time', (time.time()-t0)/60. + print('--time', (time.time()-t0)/60.) return visit_times