about summary refs log tree commit diff
path: root/wqflask/utility
diff options
context:
space:
mode:
Diffstat (limited to 'wqflask/utility')
-rw-r--r--wqflask/utility/corr_result_helpers.py30
-rw-r--r--wqflask/utility/helper_functions.py2
2 files changed, 31 insertions, 1 deletions
diff --git a/wqflask/utility/corr_result_helpers.py b/wqflask/utility/corr_result_helpers.py
new file mode 100644
index 00000000..edf32449
--- /dev/null
+++ b/wqflask/utility/corr_result_helpers.py
@@ -0,0 +1,30 @@
+def normalize_values(a_values, b_values):
+    """
+    Trim two lists of values to contain only the values they both share
+    
+    Given two lists of sample values, trim each list so that it contains
+    only the samples that contain a value in both lists. Also returns
+    the number of such samples.
+    
+    >>> normalize_values([2.3, None, None, 3.2, 4.1, 5], [3.4, 7.2, 1.3, None, 6.2, 4.1])
+    ([2.3, 4.1, 5], [3.4, 6.2, 4.1], 3)
+    
+    """
+    
+    min_length = min(len(a_values), len(b_values))
+    a_new = []
+    b_new = []
+    for counter in range(min_length):
+        if a_values[counter] and b_values[counter]:
+            a_new.append(a_values[counter])
+            b_new.append(b_values[counter])
+        
+    num_overlap = len(a_new)
+    assert num_overlap == len(b_new), "Lengths should be the same"
+    
+    return a_new, b_new, num_overlap
+
+
+if __name__ == '__main__':
+    import doctest
+    doctest.testmod()
\ No newline at end of file
diff --git a/wqflask/utility/helper_functions.py b/wqflask/utility/helper_functions.py
index 28242c27..d76a32ce 100644
--- a/wqflask/utility/helper_functions.py
+++ b/wqflask/utility/helper_functions.py
@@ -9,7 +9,7 @@ def get_species_dataset_trait(self, start_vars):
     #assert type(read_genotype) == type(bool()), "Expecting boolean value for read_genotype"
     self.dataset = data_set.create_dataset(start_vars['dataset'])
     self.species = TheSpecies(dataset=self.dataset)
-    self.this_trait = GeneralTrait(dataset=self.dataset.name,
+    self.this_trait = GeneralTrait(dataset=self.dataset,
                                    name=start_vars['trait_id'],
                                    cellid=None)