optimize ws lookup when populating exemplars by using a frozen dictio…

…nary, and set the MultiString capacity when converting a LcmMultiString to a MiniLcmMultiString
sillsdev · Jun 14, 2024 · c351dcd · c351dcd
1 parent d3b25f2
commit c351dcd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/backend/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs b/backend/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs
@@ -1,4 +1,5 @@
-using FwDataMiniLcmBridge.Api.UpdateProxy;
+using System.Collections.Frozen;
+using FwDataMiniLcmBridge.Api.UpdateProxy;
 using Microsoft.Extensions.Logging;
 using MiniLcm;
 using SIL.LCModel;
@@ -138,7 +139,7 @@ internal void CompleteExemplars(WritingSystems writingSystems)
         var wsExemplars = writingSystems.Vernacular.Concat(writingSystems.Analysis)
             .Distinct()
             .ToDictionary(ws => ws, ws => ws.Exemplars.Select(s => s[0]).ToHashSet());
-        var wsExemplarsByHandle = wsExemplars.ToDictionary(kv => GetWritingSystemHandle(kv.Key.Id), kv => kv.Value);
+        var wsExemplarsByHandle = wsExemplars.ToFrozenDictionary(kv => GetWritingSystemHandle(kv.Key.Id), kv => kv.Value);
 
         foreach (var entry in _entriesRepository.AllInstances())
         {
@@ -235,7 +236,7 @@ private ExampleSentence FromLexExampleSentence(ILexExampleSentence sentence)
 
     private MultiString FromLcmMultiString(ITsMultiString multiString)
     {
-        var result = new MultiString();
+        var result = new MultiString(multiString.StringCount);
         for (var i = 0; i < multiString.StringCount; i++)
         {
             var tsString = multiString.GetStringFromIndex(i, out var ws);

diff --git a/backend/FwDataMiniLcmBridge/Api/LcmHelpers.cs b/backend/FwDataMiniLcmBridge/Api/LcmHelpers.cs
@@ -53,7 +53,7 @@ internal static bool SearchValue(this ITsMultiString multiString, string value)
         '\u0640', // Arabic Tatweel
     ];
 
-    internal static void ContributeExemplars(ITsMultiString multiString, Dictionary<int, HashSet<char>> wsExemplars)
+    internal static void ContributeExemplars(ITsMultiString multiString, IReadOnlyDictionary<int, HashSet<char>> wsExemplars)
     {
         for (var i = 0; i < multiString.StringCount; i++)
         {
@@ -62,6 +62,7 @@ internal static void ContributeExemplars(ITsMultiString multiString, Dictionary<
             var value = tsString.Text.AsSpan().Trim(WhitespaceAndFormattingChars);
             if (!value.IsEmpty && wsExemplars.TryGetValue(ws, out var exemplars))
             {
+                //todo should we upper or lowercase the value?
                 exemplars.Add(value[0]);
             }
         }

diff --git a/backend/MiniLcm/MultiString.cs b/backend/MiniLcm/MultiString.cs
@@ -12,6 +12,10 @@ namespace MiniLcm;
 [JsonConverter(typeof(MultiStringConverter))]
 public class MultiString: IDictionary
 {
+    public MultiString(int capacity)
+    {
+        Values = new MultiStringDict(capacity);
+    }
     public MultiString()
     {
         Values = new MultiStringDict();
@@ -41,6 +45,10 @@ private class MultiStringDict : Dictionary<WritingSystemId, string>,
 #pragma warning restore CS8644 // Type does not implement interface member. Nullability of reference types in interface implemented by the base type doesn't match.
         IDictionary
     {
+        public MultiStringDict(int capacity) : base(capacity)
+        {
+
+        }
         public MultiStringDict()
         {
         }