Fix problems caused by merge conflict

This commit is contained in:
Ines Montani 2019-12-21 19:57:41 +01:00
parent 947dba7141
commit d17e7dca9e
2 changed files with 3 additions and 3 deletions

View File

@ -313,7 +313,7 @@ class Scorer(object):
cand_deps_per_dep[token.dep_.lower()].add(
(gold_i, gold_head, token.dep_.lower())
)
if "-" not in [token[-1] for token in gold.orig_annot]:
if "-" not in [token[-1] for token in orig.entities]:
# Find all NER labels in gold and doc
ent_labels = set([x[0] for x in gold_ents] + [k.label_ for k in doc.ents])
# Set up all labels for per type scoring and prepare gold per type

View File

@ -116,10 +116,10 @@ cdef class Tokenizer:
def __set__(self, rules):
self._rules = {}
self._reset_cache([key for key in self._cache])
self._reset_specials()
self._flush_specials()
self._cache = PreshMap()
self._specials = PreshMap()
self._load_special_tokenization(rules)
self._load_special_cases(rules)
def __reduce__(self):
args = (self.vocab,