explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2025-01-13 02:36:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix problems caused by merge conflict

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spacy/scorer.py
View File

@ -313,7 +313,7 @@ class Scorer(object):
cand_deps_per_dep[token.dep_.lower()].add( cand_deps_per_dep[token.dep_.lower()].add(
(gold_i, gold_head, token.dep_.lower()) (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 # 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]) 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 # Set up all labels for per type scoring and prepare gold per type

4
spacy/tokenizer.pyx
View File

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