Rooba
/
spaCy
mirror of https://github.com/explosion/spaCy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Don't refuse to parse single token sentences, incase some transition system needs them, e.g. single word entity. Instead fix error in _init_state.

This commit is contained in:
Matthew Honnibal 2015-06-13 22:55:55 +02:00
parent b643cb3d5c
commit 75289b4761
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spacy/syntax/parser.pyx
View File

@ -74,8 +74,6 @@ cdef class Parser:
self.model = Model(self.moves.n_moves, templates, model_dir) self.model = Model(self.moves.n_moves, templates, model_dir)
def __call__(self, Tokens tokens): def __call__(self, Tokens tokens):
if tokens.length == 0:
return 0
if self.cfg.get('beam_width', 1) < 1: if self.cfg.get('beam_width', 1) < 1:
self._greedy_parse(tokens) self._greedy_parse(tokens)
else: else:
@ -108,9 +106,9 @@ cdef class Parser:
cdef int _beam_parse(self, Tokens tokens) except -1: cdef int _beam_parse(self, Tokens tokens) except -1:
cdef Beam beam = Beam(self.moves.n_moves, self.cfg.beam_width) cdef Beam beam = Beam(self.moves.n_moves, self.cfg.beam_width)
words = [w.orth_ for w in tokens]
beam.initialize(_init_state, tokens.length, tokens.data) beam.initialize(_init_state, tokens.length, tokens.data)
beam.check_done(_check_final_state, NULL) beam.check_done(_check_final_state, NULL)
words = [w.orth_ for w in tokens]
while not beam.is_done: while not beam.is_done:
self._advance_beam(beam, None, False, words) self._advance_beam(beam, None, False, words)
state = <StateClass>beam.at(0) state = <StateClass>beam.at(0)
@ -231,7 +229,7 @@ cdef int _transition_state(void* _dest, void* _src, class_t clas, void* _moves)
cdef void* _init_state(Pool mem, int length, void* tokens) except NULL: cdef void* _init_state(Pool mem, int length, void* tokens) except NULL:
cdef StateClass st = StateClass.init(<const TokenC*>tokens, length) cdef StateClass st = StateClass.init(<const TokenC*>tokens, length)
st.push() st.fast_forward()
Py_INCREF(st) Py_INCREF(st)
return <void*>st return <void*>st