Skip to content
Snippets Groups Projects
Commit 1186a343 authored by AndiMajore's avatar AndiMajore
Browse files

betweenes centrality fixed

parent 03b7124d
No related branches found
No related tags found
No related merge requests found
...@@ -181,6 +181,7 @@ def betweenness_centrality(task_hook: TaskHook): ...@@ -181,6 +181,7 @@ def betweenness_centrality(task_hook: TaskHook):
g, seed_ids, drug_ids = read_graph_tool_graph( g, seed_ids, drug_ids = read_graph_tool_graph(
filename, filename,
seeds, seeds,
id_space,
max_deg, max_deg,
include_indirect_drugs, include_indirect_drugs,
include_non_approved_drugs, include_non_approved_drugs,
......
...@@ -213,7 +213,7 @@ def kpm_task(task_hook: TaskHook): ...@@ -213,7 +213,7 @@ def kpm_task(task_hook: TaskHook):
if id_space == 'ensembl': if id_space == 'ensembl':
node_map[node.uniprot_code] = [ensg.name for ensg in EnsemblGene.objects.filter(protein_id=node.id)] node_map[node.uniprot_code] = [ensg.name for ensg in EnsemblGene.objects.filter(protein_id=node.id)]
flat_map = lambda f, xs: [y for ys in xs for y in f(ys)] flat_map = lambda f, xs: (y for ys in xs for y in f(ys))
network["nodes"] = flat_map(lambda uniprot: node_map[uniprot], network["nodes"]) network["nodes"] = flat_map(lambda uniprot: node_map[uniprot], network["nodes"])
network["edges"] = list(map( network["edges"] = list(map(
......
...@@ -92,8 +92,9 @@ def read_graph_tool_graph(file_path, seeds, id_space, max_deg, include_indirect_ ...@@ -92,8 +92,9 @@ def read_graph_tool_graph(file_path, seeds, id_space, max_deg, include_indirect_
deleted_edges = [] deleted_edges = []
if ( # If only_direct_drugs should be included, remove any drug-protein edges that the drug is not a direct neighbor of
drug_ids and not include_indirect_drugs): # If only_direct_drugs should be included, remove any drug-protein edges that the drug is not a direct neighbor of any seeds # any seeds
if drug_ids and not include_indirect_drugs:
direct_drugs = set() direct_drugs = set()
for edge in g.edges(): for edge in g.edges():
if g.vertex_properties["type"][edge.target()] == d_type and edge.source() in seed_ids: if g.vertex_properties["type"][edge.target()] == d_type and edge.source() in seed_ids:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment