erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-21 15:17:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

chore(common/models): Merge branch 'fix/common/models/context-reset-predictions' into feat/common/models/mid-context-suggestions

Browse source
This commit is contained in:
jahorton 2021-02-08 09:31:26 +07:00
commit a2adfd736e
1 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
common/predictive-text/worker/model-compositor.ts
View file

@ -86,7 +86,7 @@ class ModelCompositor {
let postContext = models.applyTransform(inputTransform, context);
let keepOptionText = this.wordbreak(postContext);
let keepOption: Keep = null;
let keepOption: Outcome<Keep> = null;
let rawPredictions: Distribution<Suggestion> = [];
@ -196,16 +196,26 @@ class ModelCompositor {
// Running in bulk over all suggestions, duplicate entries may be possible.
let predictions = this.predictFromCorrections(predictionRoots, context);
rawPredictions = rawPredictions.concat(predictions);
// TODO: We don't currently de-duplicate predictions at this point quite yet, so
// it's technically possible that we return too few.
if(rawPredictions.length >= ModelCompositor.MAX_SUGGESTIONS) {
break;
} else if(matches[0].totalCost >= bestCorrectionCost + 4) { // e^-4 = 0.0183156388. Allows "80%" of an extra edit.
let correctionCost = matches[0].totalCost;
if(correctionCost >= bestCorrectionCost + 4) { // e^-4 = 0.0183156388. Allows "80%" of an extra edit.
// Very useful for stopping 'sooner' when words reach a sufficient length.
break;
}
} else if(rawPredictions.length >= ModelCompositor.MAX_SUGGESTIONS) {
// Sort the prediction list; we need them in descending order for the next check.
rawPredictions.sort(function(a, b) {
return b.p - a.p;
});
// If the best suggestion from the search's current tier fails to beat the worst
// pending suggestion from previous tiers, assume all further corrections will
// similarly fail to win; terminate the search-loop.
if(rawPredictions[ModelCompositor.MAX_SUGGESTIONS-1].p > Math.exp(-correctionCost)) {
break;
}
}
}
}
@ -222,22 +232,26 @@ class ModelCompositor {
if(displayText == keepOptionText || (lexicalModel.toKey && displayText == lexicalModel.toKey(keepOptionText)) ) {
// Preserve the original, pre-keyed version of the text.
let baseTransform = prediction.sample.transform;
if(!keepOption) {
let baseTransform = prediction.sample.transform;
let keepTransform = {
insert: keepOptionText,
deleteLeft: baseTransform.deleteLeft,
deleteRight: baseTransform.deleteRight,
id: baseTransform.id
let keepTransform = {
insert: keepOptionText,
deleteLeft: baseTransform.deleteLeft,
deleteRight: baseTransform.deleteRight,
id: baseTransform.id
}
let intermediateKeep = models.transformToSuggestion(keepTransform, prediction.p);
keepOption = this.toAnnotatedSuggestion(intermediateKeep, 'keep', models.QuoteBehavior.noQuotes);
keepOption.matchesModel = true;
// Since we replaced the original Suggestion with a keep-annotated one,
// we must manually preserve the transform ID.
keepOption.transformId = prediction.sample.transformId;
} else if(keepOption.p && prediction.p) {
keepOption.p += prediction.p;
}
let intermediateKeep = models.transformToSuggestion(keepTransform, prediction.p);
keepOption = this.toAnnotatedSuggestion(intermediateKeep, 'keep', models.QuoteBehavior.noQuotes);
keepOption.matchesModel = true;
// Since we replaced the original Suggestion with a keep-annotated one,
// we must manually preserve the transform ID.
keepOption.transformId = prediction.sample.transformId;
} else {
let existingSuggestion = suggestionDistribMap[displayText];
if(existingSuggestion) {