GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-09-17 15:56:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

simpler and correct condition for bu_predict

Browse Source
This commit is contained in:
Krasimir Angelov
2026-08-28 11:18:01 +02:00
parent 4f4ccccc91
commit f2e1b999b4
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/runtime/c/pgf/parser.cxx
+7 -1
View File
@@ -956,6 +956,7 @@ void PgfParser::bu_predict(PgfPhrasetable<PgfSymbolBIND> phrasetable,
next_state->end = state->end; next_state->end = state->end;
next_state->next = state->next; next_state->next = state->next;
next_state->needs_bind = false; next_state->needs_bind = false;
next_state->did_bu_predict = false;
next_state->viterbi_prob = state->viterbi_prob; next_state->viterbi_prob = state->viterbi_prob;
state->next = next_state; state->next = next_state;
} }
@@ -1381,6 +1382,7 @@ PgfAbstractParser::State *PgfParser::new_state(const PgfTextSpot &start, prob_t
state = new State; state = new State;
state->start = start; state->start = start;
state->end = start; state->end = start;
state->did_bu_predict = false;
state->viterbi_prob = viterbi_prob; state->viterbi_prob = viterbi_prob;
state->next = *prev; state->next = *prev;
*prev = state; *prev = state;
@@ -1421,6 +1423,7 @@ void PgfParser::symbol_bind(Item *item, State *state, PgfSymbol sym)
next_state->end = state->end; next_state->end = state->end;
next_state->next = state->next; next_state->next = state->next;
next_state->needs_bind = false; next_state->needs_bind = false;
next_state->did_bu_predict = false;
next_state->viterbi_prob = state->viterbi_prob; next_state->viterbi_prob = state->viterbi_prob;
state->next = next_state; state->next = next_state;
} }
@@ -1480,7 +1483,8 @@ void PgfParser::suspend(Cont *cont,Item *item,bool do_predict,ref<PgfSymbolCat>
epsilontable_iter(concr->epsilontable,cont->lincat,f); epsilontable_iter(concr->epsilontable,cont->lincat,f);
} }
if (do_predict) { if (!cont->state->did_bu_predict) {
cont->state->did_bu_predict = true;
prob_t viterbi_prob = item->inside_prob+item->outside_prob; prob_t viterbi_prob = item->inside_prob+item->outside_prob;
if (cont->state->needs_bind) { if (cont->state->needs_bind) {
bu_predict(concr->phrasetable4, cont->state, viterbi_prob); bu_predict(concr->phrasetable4, cont->state, viterbi_prob);
@@ -1730,6 +1734,8 @@ PgfParseTableMaker::PgfParseTableMaker(ref<PgfConcr> concr)
current_state = new State; current_state = new State;
current_state->start.pos = 0; current_state->start.pos = 0;
current_state->start.byte_pos = 0; current_state->start.byte_pos = 0;
current_state->needs_bind = false;
current_state->did_bu_predict = false;
current_state->end = current_state->start; current_state->end = current_state->start;
current_state->viterbi_prob = 0; current_state->viterbi_prob = 0;
current_state->next = NULL; current_state->next = NULL;
src/runtime/c/pgf/parser.h
+1
View File
@@ -99,6 +99,7 @@ protected:
struct State { struct State {
PgfTextSpot start, end; PgfTextSpot start, end;
bool needs_bind; bool needs_bind;
bool did_bu_predict;
std::map<ref<PgfConcrLincat>,Cont*> conts1; std::map<ref<PgfConcrLincat>,Cont*> conts1;
std::map<CCat*,Cont*> conts2; std::map<CCat*,Cont*> conts2;
std::map<Cont*,interval_map<interval_map<CCat*>>> completed; std::map<Cont*,interval_map<interval_map<CCat*>>> completed;