Skip to content

Python2 3 compat #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wizofe wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Python2 3 compat #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5f2022
Change scipy import to new versions
wizofe Jun 19, 2022
3283e68
Add parentheses to the print statements
wizofe Jun 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions nigraph/metrics/static.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -3044,29 +3044,29 @@ 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

else:
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