Merge branch 'rethinc2' of https://github.com/honnibal/spaCy into rethinc2

This commit is contained in:
Matthew Honnibal 2016-02-01 03:08:49 +01:00
commit d5579cd0d8
1 changed files with 6 additions and 6 deletions

View File

@ -395,13 +395,13 @@ cdef class ArcEager(TransitionSystem):
elif USE_ROOT_ARC_SEGMENT and st.c._sent[i].dep == self.root_label: elif USE_ROOT_ARC_SEGMENT and st.c._sent[i].dep == self.root_label:
st.c._sent[i].head = 0 st.c._sent[i].head = 0
cdef int set_valid(self, int* output, StateClass stcls) nogil: cdef int set_valid(self, int* output, const StateC* st) nogil:
cdef bint[N_MOVES] is_valid cdef bint[N_MOVES] is_valid
is_valid[SHIFT] = Shift.is_valid(stcls.c, -1) is_valid[SHIFT] = Shift.is_valid(st, -1)
is_valid[REDUCE] = Reduce.is_valid(stcls.c, -1) is_valid[REDUCE] = Reduce.is_valid(st, -1)
is_valid[LEFT] = LeftArc.is_valid(stcls.c, -1) is_valid[LEFT] = LeftArc.is_valid(st, -1)
is_valid[RIGHT] = RightArc.is_valid(stcls.c, -1) is_valid[RIGHT] = RightArc.is_valid(st, -1)
is_valid[BREAK] = Break.is_valid(stcls.c, -1) is_valid[BREAK] = Break.is_valid(st, -1)
cdef int i cdef int i
for i in range(self.n_moves): for i in range(self.n_moves):
output[i] = is_valid[self.c[i].move] output[i] = is_valid[self.c[i].move]