diff --git a/drugstone/backend_tasks.py b/drugstone/backend_tasks.py index 89dd52d40812252a265a5f485577da233ff9966f..5e78f8ec9aa94a991b893927fffc530d9089074f 100755 --- a/drugstone/backend_tasks.py +++ b/drugstone/backend_tasks.py @@ -56,9 +56,15 @@ def run_task(token, algorithm, parameters): try: if algorithm == 'dummy': raise RuntimeError('Dummy algorithm for testing purposes.') - elif algorithm in ['multisteiner', 'connect', 'connectSelected']: + elif algorithm == 'multisteiner': from tasks.multi_steiner import multi_steiner multi_steiner(task_hook) + elif algorithm in ['connect', 'connectSelected']: + from tasks.multi_steiner import multi_steiner + task_hook.parameters["num_trees"] = 5 + task_hook.parameters["tolerance"] = 5 + task_hook.parameters["hub_penalty"] = 0.5 + multi_steiner(task_hook) elif algorithm == 'keypathwayminer': from tasks.keypathwayminer_task import kpm_task kpm_task(task_hook) diff --git a/tasks/quick_task.py b/tasks/quick_task.py index a49536e512c7479990cee36221f04dac77fda790..9d1df24c8fc8fdce803ea830ca3e9e8e633a1d26 100755 --- a/tasks/quick_task.py +++ b/tasks/quick_task.py @@ -37,22 +37,18 @@ def quick_task(task_hook: TaskHook): if len(seeds) == 0: task_hook.set_results({"network": {"nodes": [], "edges": []}}) return - og_seeds = parameters.get('seeds') parameters.update({ "seeds": seeds, - "result_size": 10, - "hub_penalty": 1, + "result_size": 50, + "hub_penalty": 0, "target": "drug", - "include_non_approved_drugs": True + "include_non_approved_drugs": False }) - is_seed = result.get('node_attributes') run_closeness(parameters, result["network"], result['node_attributes']['is_seed']) - # parameters.update({ - # "seeds": og_seeds - # }) - parameters["num_trees"] = 1 - parameters["hub_penalty"] = 1 + parameters["num_trees"] = 5 + parameters["tolerance"] = 5 + parameters["hub_penalty"] = 0.5 # Prepare intermediate hook ms_task_hook = TaskHook(parameters,