Skip to content
Snippets Groups Projects
Commit 67f91b16 authored by Tim O'Donnell's avatar Tim O'Donnell
Browse files

fixes

parent 14a64588
No related branches found
No related tags found
No related merge requests found
...@@ -38,9 +38,9 @@ class AlleleEncoding(object): ...@@ -38,9 +38,9 @@ class AlleleEncoding(object):
if self.borrow_from is None: if self.borrow_from is None:
assert allele_to_sequence is not None assert allele_to_sequence is not None
all_alleles = ( all_alleles = (
sorted(allele_to_sequence) sorted(allele_to_sequence))
if alleles is None #if alleles is None
else list(sorted(alleles.unique()))) #else list(sorted(alleles.unique())))
self.allele_to_index = dict( self.allele_to_index = dict(
(allele, i) (allele, i)
for (i, allele) in enumerate(all_alleles)) for (i, allele) in enumerate(all_alleles))
...@@ -58,7 +58,9 @@ class AlleleEncoding(object): ...@@ -58,7 +58,9 @@ class AlleleEncoding(object):
if alleles is not None: if alleles is not None:
assert all( assert all(
allele in self.allele_to_index for allele in alleles) allele in self.allele_to_index for allele in alleles),\
"Missing alleles: " + " ".join([
a for a in alleles if a not in self.allele_to_index])
self.indices = alleles.map(self.allele_to_index) self.indices = alleles.map(self.allele_to_index)
assert not self.indices.isnull().any() assert not self.indices.isnull().any()
else: else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment