Merge branch 'development' into production

Former-commit-id: 903783f08667d20a6094f6e1adda333c95343a5a [formerly 7f74afb9fb2aadd8f903331068fe75fd3c47c86a]
Former-commit-id: e9ed4c3dfa50e670df90df0dadfd59ab87fbdd6d

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)

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,