Change naming; using extensions

sillsdev · Nov 8, 2024 · c9a1e23 · c9a1e23
1 parent 4ec67d2
commit c9a1e23
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/src/ServiceToolkit/src/SIL.ServiceToolkit/Services/ParallelCorpusPreprocessingService.cs b/src/ServiceToolkit/src/SIL.ServiceToolkit/Services/ParallelCorpusPreprocessingService.cs
@@ -91,21 +91,21 @@ row.Ref is not ScriptureRef sr
             if (sourceCorpora.Length == 0)
                 continue;
 
-            NParallelTextCorpus alignedSourceTrainingCorpora = new NParallelTextCorpus(sourceTrainingCorpora)
-            {
-                AllRowsList = Enumerable.Repeat(true, sourceTrainingCorpora.Length).ToArray()
-            };
-            ITextCorpus sourceTrainingCorpus = alignedSourceTrainingCorpora.SelectRandom(Seed);
+            NParallelTextCorpus alignedSourceTrainingCorpora = CorporaExtensions.AlignMany(
+                sourceTrainingCorpora,
+                Enumerable.Repeat(true, sourceTrainingCorpora.Length).ToArray()
+            );
+            ITextCorpus sourceTrainingCorpus = alignedSourceTrainingCorpora.ChooseRandom(Seed);
             if (sourceTrainingCorpus.IsScripture())
             {
                 sourceTrainingCorpus = sourceTrainingCorpus.Where(IsScriptureRow);
             }
 
-            NParallelTextCorpus alignedTargetCorpora = new NParallelTextCorpus(targetTrainingCorpora)
-            {
-                AllRowsList = Enumerable.Repeat(true, targetTrainingCorpora.Length).ToArray()
-            };
-            ITextCorpus targetCorpus = alignedTargetCorpora.SelectFirst();
+            NParallelTextCorpus alignedTargetCorpora = CorporaExtensions.AlignMany(
+                targetTrainingCorpora,
+                Enumerable.Repeat(true, targetTrainingCorpora.Length).ToArray()
+            );
+            ITextCorpus targetCorpus = alignedTargetCorpora.ChooseFirst();
 
             ITextCorpus targetTrainingCorpus = targetCorpus;
             if (targetTrainingCorpus.IsScripture())
@@ -140,11 +140,11 @@ row.Ref is not ScriptureRef sr
                 }
             }
 
-            NParallelTextCorpus alignedSourcePretranslateCorpora = new NParallelTextCorpus(sourcePretranslateCorpora)
-            {
-                AllRowsList = Enumerable.Repeat(true, sourcePretranslateCorpora.Length).ToArray()
-            };
-            ITextCorpus sourcePretranslateCorpus = alignedSourcePretranslateCorpora.SelectFirst();
+            NParallelTextCorpus alignedSourcePretranslateCorpora = CorporaExtensions.AlignMany(
+                sourcePretranslateCorpora,
+                Enumerable.Repeat(true, sourcePretranslateCorpora.Length).ToArray()
+            );
+            ITextCorpus sourcePretranslateCorpus = alignedSourcePretranslateCorpora.ChooseFirst();
 
             IParallelTextCorpus pretranslateCorpus = sourcePretranslateCorpus.AlignRows(
                 targetCorpus,

diff --git a/src/ServiceToolkit/src/SIL.ServiceToolkit/Usings.cs b/src/ServiceToolkit/src/SIL.ServiceToolkit/Usings.cs
@@ -11,8 +11,6 @@
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
 global using SIL.Machine.Corpora;
-global using SIL.Machine.Utils;
-global using SIL.Scripture;
 global using SIL.ServiceToolkit.Models;
 global using SIL.ServiceToolkit.Services;
 global using SIL.ServiceToolkit.Utils;