Skip to content
Snippets Groups Projects
Commit 8f6295d4 authored by AndiMajore's avatar AndiMajore
Browse files

fixing quick and super start options

parent 2985e3c3
No related branches found
No related tags found
No related merge requests found
import json
import traceback
from datetime import datetime
import redis
......@@ -69,9 +70,10 @@ def run_task(token, algorithm, parameters):
elif algorithm in ['quick', 'super']:
from tasks.quick_task import quick_task
quick_task(task_hook)
except Exception as e:
r.set(f'{token}_status', f'{e}')
except Exception as ex:
r.set(f'{token}_status', f'{ex}')
r.set(f'{token}_failed', '1')
print(''.join(traceback.format_exception(etype=type(ex), value=ex, tb=ex.__traceback__)))
def refresh_from_redis(task):
......
......@@ -4,7 +4,7 @@ python3 manage.py makemigrations drugstone
python3 manage.py migrate
python3 manage.py createfixtures
python3 manage.py cleanuptasks
#python3 manage.py populate_db --update -a
python3 manage.py populate_db --update -a
#python3 manage.py make_graphs
/usr/bin/supervisord -c "/etc/supervisor/conf.d/supervisord.conf"
......@@ -31,6 +31,25 @@ def quick_task(task_hook: TaskHook):
# Run closeness centrality
closeness_centrality(closeness_task_hook)
def run_trust_rank(parameters, seeds):
from .trust_rank import trust_rank
def progress(progress, status):
task_hook.set_progress(2 / 3 + 1 / 3 * progress, status)
def set_result(result):
task_hook.set_results(result)
parameters.update({
"seeds": seeds,
"result_size": 20,
"include_non_approved_drugs": True,
"include_indirect_drugs": False,
})
tr_task_hook = TaskHook(parameters, task_hook.data_directory, progress, set_result)
trust_rank(tr_task_hook)
def run_multi_steiner(parameters):
from .multi_steiner import multi_steiner
......@@ -47,14 +66,8 @@ def quick_task(task_hook: TaskHook):
if len(seeds) == 0:
task_hook.set_results({"network": {"nodes": [], "edges": []}})
return
closeness_parameters = {
"seeds": seeds,
"result_size": 10,
"hub_penalty": 1,
"strain_or_drugs": "drugs",
"include_non_approved_drugs": True,
}
run_closeness(closeness_parameters)
run_trust_rank(parameters, seeds)
parameters["num_trees"] = 1
parameters["hub_penalty"] = 1
......
......@@ -86,7 +86,6 @@ def scores_to_results(
"nodes": [g.vertex_properties[node_name_attribute][node] for node in returned_nodes],
"edges": [{"from": g.vertex_properties[node_name_attribute][source], "to": g.vertex_properties[node_name_attribute][target]} for source, target in returned_edges],
}
print(subgraph)
# Compute node attributes.
node_types = {g.vertex_properties[node_name_attribute][node]: g.vertex_properties["type"][node] for node in returned_nodes}
......
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