From 300a8dfabb326762200880ab9e56711378050ee4 Mon Sep 17 00:00:00 2001
From: AndiMajore <andi.majore@googlemail.com>
Date: Tue, 14 Feb 2023 19:12:58 +0100
Subject: [PATCH] updated quick and connect all params
Former-commit-id: dab04156d945994099be41870285d0ea1db90da5 [formerly 5435fe70e2e40e4e5bef72792672fdadd5648916]
Former-commit-id: b4a4d4edd952f18e3bc4e7321d2c566ae182e95a
---
drugstone/backend_tasks.py | 8 +++++++-
tasks/quick_task.py | 16 ++++++----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/drugstone/backend_tasks.py b/drugstone/backend_tasks.py
index 89dd52d..5e78f8e 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 a49536e..9d1df24 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,
--
GitLab