From 8f132833e945bd1b364074e247533598abac339e Mon Sep 17 00:00:00 2001 From: giuliorossetti Date: Tue, 12 Mar 2019 08:24:38 +0100 Subject: [PATCH] :bug: community I/O --- cdlib/algorithms/crisp_partition.py | 2 +- cdlib/classes/node_clustering.py | 2 +- cdlib/readwrite/io.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cdlib/algorithms/crisp_partition.py b/cdlib/algorithms/crisp_partition.py index 9513f507..97b9f13e 100644 --- a/cdlib/algorithms/crisp_partition.py +++ b/cdlib/algorithms/crisp_partition.py @@ -821,7 +821,7 @@ def frc_fgsn(graph, theta, eps, r): nx.relabel_nodes(g, maps, False) fuzz_assoc = {maps[nid]: v for nid, v in fuzz_assoc.items()} else: - coms = [tuple(c) for c in communities] + coms = [list(c) for c in communities] return FuzzyNodeClustering(coms, fuzz_assoc, graph, "FuzzyComm", method_parameters={"theta": theta, "eps": eps, "r": r}) diff --git a/cdlib/classes/node_clustering.py b/cdlib/classes/node_clustering.py index 7a2e5564..1f605539 100644 --- a/cdlib/classes/node_clustering.py +++ b/cdlib/classes/node_clustering.py @@ -158,7 +158,7 @@ def fraction_over_median_degree(self, **kwargs): """ if self.__check_graph(): - return evaluation.fraction_over_median_degree(self.graph, self,**kwargs) + return evaluation.fraction_over_median_degree(self.graph, self, **kwargs) else: raise ValueError("Graph instance not specified") diff --git a/cdlib/readwrite/io.py b/cdlib/readwrite/io.py index 918f6529..c7f21476 100644 --- a/cdlib/readwrite/io.py +++ b/cdlib/readwrite/io.py @@ -51,7 +51,7 @@ def read_community_csv(path, delimiter=",", nodetype=str): with open(path) as f: for row in f: community = list(map(nodetype, row.rstrip().split(delimiter))) - communities.append(tuple(community)) + communities.append(list(community)) return NodeClustering(communities, None, "") @@ -106,7 +106,7 @@ def read_community_json(path): with open(path, "r") as f: coms = json.load(f) - nc = NodeClustering([tuple(c) for c in coms['communities']], None, coms['algorithm'], + nc = NodeClustering([list(c) for c in coms['communities']], None, coms['algorithm'], coms['params'], coms['overlap']) nc.node_coverage = coms['coverage'] @@ -120,7 +120,7 @@ def read_community_json(path): cm = [] for e in c: cm.append(tuple(e)) - cms.append(tuple(cm)) + cms.append(list(cm)) nc.communities = cms nc.__class__ = EdgeClustering @@ -148,7 +148,7 @@ def read_community_from_json_string(json_repr): coms = json.loads(json_repr) - nc = NodeClustering([tuple(c) for c in coms['communities']], None, coms['algorithm'], + nc = NodeClustering([list(c) for c in coms['communities']], None, coms['algorithm'], coms['params'], coms['overlap']) nc.node_coverage = coms['coverage']