diff options
author | Alexander Kabui | 2021-09-27 16:09:46 +0300 |
---|---|---|
committer | Alexander Kabui | 2021-09-27 16:09:46 +0300 |
commit | 62054d914efb4322fba311f968cb27b662aa6806 (patch) | |
tree | f904231c44d87db36e9b794f57373daf6508a11c /gn3/computations/parsers.py | |
parent | 6f25b8e2b1d1a34c054d325b1c37b303529b8827 (diff) | |
parent | 0cbb6ecde0315b7d6f021cb17406f5e5197e8a05 (diff) | |
download | genenetwork3-62054d914efb4322fba311f968cb27b662aa6806.tar.gz |
fix merge conflicts
Diffstat (limited to 'gn3/computations/parsers.py')
-rw-r--r-- | gn3/computations/parsers.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gn3/computations/parsers.py b/gn3/computations/parsers.py index 94387ff..1af35d6 100644 --- a/gn3/computations/parsers.py +++ b/gn3/computations/parsers.py @@ -14,7 +14,7 @@ def parse_genofile(file_path: str) -> Tuple[List[str], 'h': 0, 'u': None, } - genotypes, strains = [], [] + genotypes, samples = [], [] with open(file_path, "r") as _genofile: for line in _genofile: line = line.strip() @@ -22,8 +22,8 @@ def parse_genofile(file_path: str) -> Tuple[List[str], continue cells = line.split() if line.startswith("Chr"): - strains = cells[4:] - strains = [strain.lower() for strain in strains] + samples = cells[4:] + samples = [sample.lower() for sample in samples] continue values = [__map.get(value.lower(), None) for value in cells[4:]] genotype = { @@ -32,7 +32,7 @@ def parse_genofile(file_path: str) -> Tuple[List[str], "cm": cells[2], "mb": cells[3], "values": values, - "dicvalues": dict(zip(strains, values)), + "dicvalues": dict(zip(samples, values)), } genotypes.append(genotype) - return strains, genotypes + return samples, genotypes |