diff options
author | Frederick Muriuki Muriithi | 2022-11-22 11:44:06 +0300 |
---|---|---|
committer | Frederick Muriuki Muriithi | 2022-11-22 11:44:06 +0300 |
commit | 839e76a13b259ce18cf393a5dc98f6e44fc0182c (patch) | |
tree | 961f56e02028c8b87d019eb1ef04803cf51c7ac0 /wqflask | |
parent | 5ba0c9fee42e3ca0b8e3cc4df38d1e555194a845 (diff) | |
parent | 5319940dc0cdf84fce53f0058a3c4315cd3d6652 (diff) | |
download | genenetwork2-839e76a13b259ce18cf393a5dc98f6e44fc0182c.tar.gz |
Merge branch 'Alexanderlacuna-bugfix/use-f1-parents' into testing
Diffstat (limited to 'wqflask')
-rw-r--r-- | wqflask/wqflask/correlation/rust_correlation.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/wqflask/wqflask/correlation/rust_correlation.py b/wqflask/wqflask/correlation/rust_correlation.py index 935ab699..c57171c6 100644 --- a/wqflask/wqflask/correlation/rust_correlation.py +++ b/wqflask/wqflask/correlation/rust_correlation.py @@ -234,11 +234,18 @@ def __compute_sample_corr__( """Compute the sample correlations""" (this_dataset, this_trait, target_dataset, sample_data) = target_trait_info + if this_dataset.group.f1list !=None: + this_dataset.group.samplelist+= this_dataset.group.f1list + + if this_dataset.group.parlist!= None: + this_dataset.group.samplelist+= this_dataset.group.parlist + sample_data = get_sample_corr_data( sample_type=start_vars["corr_samples_group"], sample_data= json.loads(start_vars["sample_vals"]), all_samples=this_dataset.group.all_samples_ordered(), dataset_samples=this_dataset.group.all_samples_ordered()) + if not bool(sample_data): return {} |