diff --git a/netbone/backbone.py b/netbone/backbone.py index 9c8437bba212312d02bd0246785cdd00bc9d8af8..db6c4ad7206a12f66c9eba8c2d2c3e771c26b4fb 100644 --- a/netbone/backbone.py +++ b/netbone/backbone.py @@ -1,6 +1,6 @@ import networkx as nx from pandas import DataFrame -from netbone.Utils.utils import edge_properties +from netbone.utils.utils import edge_properties class Backbone: diff --git a/netbone/compare.py b/netbone/compare.py index 61e390249dffa775fad3d549bc9384ec401797a5..7ec623d9d8fbadd1d076ee388d99c5cbdb560bb9 100644 --- a/netbone/compare.py +++ b/netbone/compare.py @@ -1,6 +1,6 @@ import pandas as pd import networkx as nx -from netbone.Utils.utils import cumulative_dist +from netbone.utils.utils import cumulative_dist from netbone.filters import threshold_filter, boolean_filter from pandas import DataFrame from scipy.stats import kstest diff --git a/netbone/filters.py b/netbone/filters.py index d159c8484b6123a954787b3571e8ee3748937d88..b32993bd032014d11411cff038f38546531b7405 100644 --- a/netbone/filters.py +++ b/netbone/filters.py @@ -1,7 +1,7 @@ import math import networkx as nx -from netbone.Utils.utils import edge_properties +from netbone.utils.utils import edge_properties def boolean_filter(backbone, narrate=True, value=[]): if boolean_filter in backbone.filters(): data = backbone.graph diff --git a/netbone/measures.py b/netbone/measures.py index f422d921ba298b1751ae23a74d4f1795deef7ebe..e97bfc1aa1fb40aaf23da761c9e6b343a209a932 100644 --- a/netbone/measures.py +++ b/netbone/measures.py @@ -1,7 +1,7 @@ import igraph as ig import networkx as nx import numpy as np -from netbone.Utils.utils import lcc +from netbone.utils.utils import lcc from scipy.stats import entropy diff --git a/netbone/statistical/global_threshold.py b/netbone/statistical/global_threshold.py index ac082ceee62cb35958ca1d07c00c66a8624b2672..38a609a07ff1cbe5b0d077aa91479fa4ab38a8f2 100644 --- a/netbone/statistical/global_threshold.py +++ b/netbone/statistical/global_threshold.py @@ -1,7 +1,7 @@ import networkx as nx from pandas import DataFrame from networkx import Graph,to_pandas_edgelist -from netbone.Utils.utils import edge_properties +from netbone.utils.utils import edge_properties from netbone.backbone import Backbone from netbone.filters import fraction_filter, threshold_filter def global_threshold(data): diff --git a/netbone/utils/__init__.py b/netbone/utils/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/netbone/utils/narrate.py b/netbone/utils/narrate.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/netbone/utils/utils.py b/netbone/utils/utils.py new file mode 100644 index 0000000000000000000000000000000000000000..0f31d2cef2682fb5e73637181578829382353704 --- /dev/null +++ b/netbone/utils/utils.py @@ -0,0 +1,24 @@ +import numpy as np +import pandas as pd +import networkx as nx + + +def lcc(G): + return G.subgraph(max(nx.connected_components(G), key=len)).copy() +def cumulative_dist(name, method, values, increasing=True): + if increasing: + x = -np.sort(-np.array(values)) + else: + x = np.sort(values) + y = np.arange(1, len(x) + 1)/len(x) + + df = pd.DataFrame(index=x) + df.index.name = name + df[method] = y + return df + +def edge_properties(df): + columns = list(df.columns) + columns.remove('source') + columns.remove('target') + return columns