From 67f91b167800a7c9f12eb46ad63be321b4dd9a9f Mon Sep 17 00:00:00 2001
From: Tim O'Donnell <timodonnell@gmail.com>
Date: Thu, 21 Mar 2019 15:35:18 -0400
Subject: [PATCH] fixes
---
mhcflurry/allele_encoding.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/mhcflurry/allele_encoding.py b/mhcflurry/allele_encoding.py
index 35a124db..7a5cc479 100644
--- a/mhcflurry/allele_encoding.py
+++ b/mhcflurry/allele_encoding.py
@@ -38,9 +38,9 @@ class AlleleEncoding(object):
if self.borrow_from is None:
assert allele_to_sequence is not None
all_alleles = (
- sorted(allele_to_sequence)
- if alleles is None
- else list(sorted(alleles.unique())))
+ sorted(allele_to_sequence))
+ #if alleles is None
+ #else list(sorted(alleles.unique())))
self.allele_to_index = dict(
(allele, i)
for (i, allele) in enumerate(all_alleles))
@@ -58,7 +58,9 @@ class AlleleEncoding(object):
if alleles is not None:
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)
assert not self.indices.isnull().any()
else:
--
GitLab