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

Re-delegate vectors to vocab

Browse Source
This commit is contained in:
Matthew Honnibal 2017-05-28 11:46:10 +02:00
parent 6863d01361
commit 2445707f3c
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spacy/tokens/token.pyx
View File

@ -234,12 +234,7 @@ cdef class Token:
def __get__(self): def __get__(self):
if 'has_vector' in self.doc.user_token_hooks: if 'has_vector' in self.doc.user_token_hooks:
return self.doc.user_token_hooks['has_vector'](self) return self.doc.user_token_hooks['has_vector'](self)
cdef int i return self.vocab.has_vector(self.lex.c.orth)
for i in range(self.vocab.vectors_length):
if self.c.lex.vector[i] != 0:
return True
else:
return False
property vector: property vector:
"""A real-valued meaning representation. """A real-valued meaning representation.
@ -250,16 +245,7 @@ cdef class Token:
def __get__(self): def __get__(self):
if 'vector' in self.doc.user_token_hooks: if 'vector' in self.doc.user_token_hooks:
return self.doc.user_token_hooks['vector'](self) return self.doc.user_token_hooks['vector'](self)
cdef int length = self.vocab.vectors_length return self.vocab.get_vector(self.c.lex.orth)
if length == 0:
raise ValueError(
"Word vectors set to length 0. This may be because you "
"don't have a model installed or loaded, or because your "
"model doesn't include word vectors. For more info, see "
"the documentation: \n%s\n" % about.__docs_models__
)
vector_view = <float[:length,]>self.c.lex.vector
return numpy.asarray(vector_view)
property vector_norm: property vector_norm:
"""The L2 norm of the token's vector representation. """The L2 norm of the token's vector representation.
@ -269,7 +255,8 @@ cdef class Token:
def __get__(self): def __get__(self):
if 'vector_norm' in self.doc.user_token_hooks: if 'vector_norm' in self.doc.user_token_hooks:
return self.doc.user_token_hooks['vector_norm'](self) return self.doc.user_token_hooks['vector_norm'](self)
return self.c.lex.l2_norm vector = self.vector
return numpy.sqrt((vector ** 2).sum())
property n_lefts: property n_lefts:
def __get__(self): def __get__(self):