GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: the viterbi prob. of a state is computable only after we know the chunks

Browse Source
This commit is contained in:
Krasimir Angelov
2022-10-03 11:54:17 +02:00
parent 0bc7e8ea2e
commit 2accfa57f1
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/runtime/c/pgf/parser.cxx
View File

@@ -205,9 +205,6 @@ public:
Choice *choice; Choice *choice;
auto itr2 = parser->after->choices.find(conts); auto itr2 = parser->after->choices.find(conts);
if (itr2 == parser->after->choices.end()) { if (itr2 == parser->after->choices.end()) {
if (parser->after->choices.empty()) {
parser->after->viterbi_prob = conts->state->viterbi_prob+inside_prob+outside_prob;
}
choice = new Choice(conts, ++parser->last_choice_id, inside_prob); choice = new Choice(conts, ++parser->last_choice_id, inside_prob);
choice->trace(parser->after); choice->trace(parser->after);
parser->after->choices.insert(std::pair<ParseItemConts*,Choice*>(conts, choice)); parser->after->choices.insert(std::pair<ParseItemConts*,Choice*>(conts, choice));
@@ -519,7 +516,7 @@ public:
prob_t prob = conts->state->viterbi_prob+inside_prob; prob_t prob = conts->state->viterbi_prob+inside_prob;
for (Production *prod : choice->prods) { for (Production *prod : choice->prods) {
parser->before->queue.push(new ExprItem(choice, parser->before->queue.push(new ExprItem(choice,
prod, prob+prod->lin->lincat->abscat->prob, u);); prod, prob+prod->lin->lincat->abscat->prob, u));
} }
} else { } else {
for (auto ep : choice->exprs) { for (auto ep : choice->exprs) {
@@ -677,7 +674,7 @@ void PgfParser::start_matches(PgfTextSpot *end, PgfExn* err)
after->end = *end; after->end = *end;
after->prev = prev; after->prev = prev;
after->next = next; after->next = next;
after->viterbi_prob = prev ? prev->viterbi_prob : 0; after->viterbi_prob = INFINITY;
if (prev != NULL) prev->next = after; if (prev != NULL) prev->next = after;
if (next != NULL) next->prev = after; if (next != NULL) next->prev = after;
@@ -704,6 +701,22 @@ void PgfParser::end_matches(PgfTextSpot *end, PgfExn* err)
item->trace(after,m); item->trace(after,m);
item->proceed(this,NULL); item->proceed(this,NULL);
} }
for (auto i : after->choices) {
ParseItemConts *conts = i.first;
Choice *choice = i.second;
if (choice->is_chunk) {
prob_t viterbi_prob = conts->state->viterbi_prob+
conts->field->lincat->abscat->prob+
choice->viterbi_prob;
if (after->viterbi_prob > viterbi_prob)
after->viterbi_prob = viterbi_prob;
}
}
if (isinf(after->viterbi_prob))
after->viterbi_prob = before->viterbi_prob;
} }
void PgfParser::prepare() void PgfParser::prepare()