From 3b40fea60efa96380e0fd4d2c8d0f8d021ca9447 Mon Sep 17 00:00:00 2001 From: Alexander_Kabui Date: Tue, 16 Aug 2022 12:49:10 +0300 Subject: enable compute all for test --- wqflask/wqflask/correlation/rust_correlation.py | 5 +---- wqflask/wqflask/views.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/wqflask/wqflask/correlation/rust_correlation.py b/wqflask/wqflask/correlation/rust_correlation.py index 0bbf6533..95354994 100644 --- a/wqflask/wqflask/correlation/rust_correlation.py +++ b/wqflask/wqflask/correlation/rust_correlation.py @@ -163,10 +163,9 @@ def merge_results(dict_a: dict, dict_b: dict, dict_c: dict) -> list[dict]: **dict_c.get(trait_name, {}) } } - results = [__merge__(tname, tcorrs) for tname, tcorrs in dict_a.items()] + return [__merge__(tname, tcorrs) for tname, tcorrs in dict_a.items()] - return results def __compute_sample_corr__( @@ -251,8 +250,6 @@ def compute_correlation_rust( top_a = top_b = {} - compute_all = True - if compute_all: if corr_type == "sample": diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index 2e13451d..e054cd49 100644 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -876,7 +876,7 @@ def test_corr_compute_page(): correlation_results = compute_correlation_rust(start_vars, start_vars["corr_type"], start_vars['corr_sample_method'], - int(start_vars.get("corr_return_results", 500))) + int(start_vars.get("corr_return_results", 500)),True) correlation_results = set_template_vars(request.form, correlation_results) -- cgit v1.2.3