Skip to content

Fix bug in MergeEquivalentAnalyses #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jtmaxwell3 wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −6
Open

Fix bug in MergeEquivalentAnalyses #493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/SIL.Machine.Morphology.HermitCrab/AnalysisStratumRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ internal IEnumerable<Word> Apply(Word input, ref int alternativeCount)

_prulesRule.Apply(input);
input.Freeze();
IDictionary<Shape, Word> shapeWord = null;
IDictionary<AnalysisStateKey, Word> wordCache = null;
// Don't merge if tracing because it messes up the tracing.
bool mergeEquivalentAnalyses = _morpher.MergeEquivalentAnalyses && !_morpher.TraceManager.IsTracing;
if (mergeEquivalentAnalyses)
shapeWord = new Dictionary<Shape, Word>(FreezableEqualityComparer<Shape>.Default);
wordCache = new Dictionary<AnalysisStateKey, Word>();

// AnalysisStratumRule.Apply should cover the inverse of SynthesisStratumRule.Apply.
IEnumerable<Word> mruleOutWords = ApplyTemplates(input).Concat(ApplyMorphologicalRules(input));
Expand All @@ -152,14 +152,13 @@ internal IEnumerable<Word> Apply(Word input, ref int alternativeCount)
mruleOutWord.Source = origInput;
if (mergeEquivalentAnalyses)
{
Shape shape = mruleOutWord.Shape;
Word canonicalWord;
if (shapeWord.TryGetValue(shape, out canonicalWord))
var key = AnalysisStateKey.PinAndKey(mruleOutWord);
if (wordCache.TryGetValue(key, out Word canonicalWord))
{
canonicalWord.Alternatives.Add(mruleOutWord);
continue;
}
shapeWord[shape] = mruleOutWord;
wordCache[key] = mruleOutWord;
}
output.Add(mruleOutWord);
if (_morpher.TraceManager.IsTracing)
Expand Down
Loading