Fix a performance bug

Author: jtmaxwell3

src/SIL.Machine.Morphology.HermitCrab/AnalysisStratumRule.cs

@@ -67,6 +67,7 @@ public IEnumerable<Word> Apply(Word input)
             if (_morpher.TraceManager.IsTracing)
                 _morpher.TraceManager.BeginUnapplyStratum(_stratum, input);
 
+            Word origInput = input;
             input = input.Clone();
             input.Stratum = _stratum;
 
@@ -89,11 +90,13 @@ public IEnumerable<Word> Apply(Word input)
             {
                 if (mergeEquivalentAnalyses)
                 {
+                    // Skip intermediate sources from phonological rules, templates, and morphological rules.
+                    mruleOutWord.Source = origInput;
                     Shape shape = mruleOutWord.Shape;
                     if (shapeWord.ContainsKey(shape))
                     {
                         shapeWord[shape].Alternatives.Add(mruleOutWord);
-                         continue;
+                        continue;
                     }
                     shapeWord[shape] = mruleOutWord;
                 }

src/SIL.Machine.Morphology.HermitCrab/Morpher.cs

@@ -146,10 +146,13 @@ public IEnumerable<Word> ParseWord(string word, out object trace, bool guessRoot
                     var lexicalGuesses = LexicalGuess(analysisWord).Distinct();
                     foreach (Word synthesisWord in lexicalGuesses)
                     {
-                        foreach (Word validWord in _synthesisRule.Apply(synthesisWord).Where(IsWordValid))
+                        foreach (Word alternative in synthesisWord.ExpandAlternatives())
                         {
-                            if (IsMatch(word, validWord))
-                                matches.Add(validWord);
+                            foreach (Word validWord in _synthesisRule.Apply(alternative).Where(IsWordValid))
+                            {
+                                if (IsMatch(word, validWord))
+                                    matches.Add(validWord);
+                            }
                         }
                     }
                 }
@@ -285,10 +288,13 @@ private IEnumerable<Word> Synthesize(string word, IEnumerable<Word> analyses)
             {
                 foreach (Word synthesisWord in LexicalLookup(analysisWord))
                 {
-                    foreach (Word validWord in _synthesisRule.Apply(synthesisWord).Where(IsWordValid))
+                    foreach (Word alternative in synthesisWord.ExpandAlternatives())
                     {
-                        if (IsMatch(word, validWord))
-                            matches.Add(validWord);
+                        foreach (Word validWord in _synthesisRule.Apply(alternative).Where(IsWordValid))
+                        {
+                            if (IsMatch(word, validWord))
+                                matches.Add(validWord);
+                        }
                     }
                 }
             }
@@ -311,9 +317,9 @@ private IEnumerable<Word> Synthesize(string word, ConcurrentQueue<Word> analyses
                             analyses.TryDequeue(out Word analysisWord);
                             foreach (Word synthesisWord in LexicalLookup(analysisWord))
                             {
-                                foreach (Word alternativeSynthesis in synthesisWord.ExpandAlternatives())
+                                foreach (Word alternative in synthesisWord.ExpandAlternatives())
                                 {
-                                    foreach (Word validWord in _synthesisRule.Apply(alternativeSynthesis).Where(IsWordValid))
+                                    foreach (Word validWord in _synthesisRule.Apply(alternative).Where(IsWordValid))
                                     {
                                         if (IsMatch(word, validWord))
                                             matches.Add(validWord);

src/SIL.Machine.Morphology.HermitCrab/Word.cs

@@ -31,7 +31,6 @@ public class Word : Freezable<Word>, IAnnotatedData<ShapeNode>, ICloneable<Word>
         private bool _isPartial;
         private readonly Dictionary<string, HashSet<int>> _disjunctiveAllomorphIndices;
         private int _mruleAppCount = 0;
-        private readonly Word _cloneOf = null;
         private readonly IList<Word> _alternatives = new List<Word>();
 
         public Word(RootAllomorph rootAllomorph, FeatureStruct realizationalFS)
@@ -74,6 +73,8 @@ protected Word(Word word)
         {
             _allomorphs = new Dictionary<string, Allomorph>(word._allomorphs);
             Stratum = word.Stratum;
+            Source = word;
+            // Don't copy Alternatives.
             _shape = word._shape.Clone();
             _rootAllomorph = word._rootAllomorph;
             SyntacticFeatureStruct = word.SyntacticFeatureStruct.Clone();
@@ -94,7 +95,6 @@ protected Word(Word word)
                 kvp => new HashSet<int>(kvp.Value)
             );
             _mruleAppCount = word._mruleAppCount;
-            _cloneOf = word;
         }
 
         public IEnumerable<Annotation<ShapeNode>> Morphs
@@ -399,10 +399,7 @@ internal void NonHeadUnapplied(Word nonHead)
             _nonHeadAppIndex++;
         }
 
-        internal Word CloneOf
-        {
-            get { return _cloneOf; }
-        }
+        internal Word Source { get; set; }
 
         internal IList<Word> Alternatives
         {
@@ -412,8 +409,8 @@ internal IList<Word> Alternatives
         internal IList<Word> ExpandAlternatives()
         {
             IList<Word> alternatives = new List<Word>();
-            IList<Word> originals = _cloneOf?.ExpandAlternatives();
-            // Update the alternatives of _cloneOf with any changes made since the clone.
+            IList<Word> originals = Source?.ExpandAlternatives();
+            // Update the alternatives of CloneOf with any changes made since the clone.
             if (originals == null || originals.Count < 2)
             {
                 // Special case.
@@ -426,18 +423,17 @@ internal IList<Word> ExpandAlternatives()
                     Word alternative = original.Clone();
                     alternative._shape = this.Shape;
                     // Add new rules to alternative.
-                    foreach (IMorphologicalRule rule in MorphologicalRules)
-                    {
-                        if (_cloneOf != null && _cloneOf.MorphologicalRules.Contains(rule))
-                            continue;
-                        alternative.MorphologicalRuleUnapplied(rule);
-                    }
+                    int m_start = Source == null ? 0 : Source._mruleApps.Count();
+                    for (int i = m_start; i < _mruleApps.Count(); i++)
+                        alternative.MorphologicalRuleUnapplied(_mruleApps[i]);
+                    int nh_start = Source == null ? 0 : Source._nonHeadApps.Count();
+                    for (int i = nh_start; i < _nonHeadApps.Count(); i++)
+                        alternative.NonHeadUnapplied(_nonHeadApps[i]);
                     if (RootAllomorph != null)
                         alternative.RootAllomorph = RootAllomorph;
                     alternative.Freeze();
                     alternatives.Add(alternative);
                 }
-
             }
             // Add local alternatives.
             foreach (Word alternative in _alternatives)