Cleanup

Author: wbaldoumas

src/BaroquenMelody.Library/Ornamentation/Engine/OrnamentationEngineBuilder.cs

@@ -33,20 +33,19 @@ internal sealed class OrnamentationEngineBuilder(CompositionConfiguration compos
 
     private readonly NoteIndexPairSelector _noteIndexPairSelector = new(new NoteOnsetCalculator(musicalTimeSpanCalculator, compositionConfiguration));
 
-    private readonly OrnamentationEngineFactory _engineFactory = new(
+    private readonly OrnamentationProcessorFactory _processorFactory = new(
         musicalTimeSpanCalculator,
         new OrnamentationProcessorConfigurationFactory(
             new ChordNumberIdentifier(compositionConfiguration),
             new WeightedRandomBooleanGenerator(),
             compositionConfiguration,
             logger
-        ),
-        logger
+        )
     );
 
     public IPolicyEngine<OrnamentationItem> BuildOrnamentationEngine() => PolicyEngineBuilder<OrnamentationItem>.Configure()
         .WithoutInputPolicies()
-        .WithProcessors(_engineFactory.Create(compositionConfiguration).ToArray())
+        .WithProcessors(_processorFactory.Create(compositionConfiguration).ToArray())
         .WithOutputPolicies(new CleanConflictingOrnamentations(BuildOrnamentationCleaningEngine()))
         .Build();
 

src/BaroquenMelody.Library/Ornamentation/Engine/Processors/Factories/IOrnamentationEngineFactory.cs renamed to src/BaroquenMelody.Library/Ornamentation/Engine/Processors/Factories/IOrnamentationProcessorFactory.cs

@@ -3,7 +3,7 @@
 
 namespace BaroquenMelody.Library.Ornamentation.Engine.Processors.Factories;
 
-internal interface IOrnamentationEngineFactory
+internal interface IOrnamentationProcessorFactory
 {
     IEnumerable<IProcessor<OrnamentationItem>> Create(CompositionConfiguration compositionConfiguration);
 }

src/BaroquenMelody.Library/Ornamentation/Engine/Processors/Factories/OrnamentationEngineFactory.cs renamed to src/BaroquenMelody.Library/Ornamentation/Engine/Processors/Factories/OrnamentationProcessorFactory.cs

@@ -1,24 +1,21 @@
 using Atrea.PolicyEngine.Builders;
 using Atrea.PolicyEngine.Processors;
 using BaroquenMelody.Library.Configurations;
-using BaroquenMelody.Library.Ornamentation.Engine.Policies.Output;
 using BaroquenMelody.Library.Ornamentation.Utilities;
-using Microsoft.Extensions.Logging;
 
 namespace BaroquenMelody.Library.Ornamentation.Engine.Processors.Factories;
 
-internal sealed class OrnamentationEngineFactory(
+internal sealed class OrnamentationProcessorFactory(
     IMusicalTimeSpanCalculator musicalTimeSpanCalculator,
-    IOrnamentationProcessorConfigurationFactory configurationFactory,
-    ILogger logger
-) : IOrnamentationEngineFactory
+    IOrnamentationProcessorConfigurationFactory configurationFactory
+) : IOrnamentationProcessorFactory
 {
     public IEnumerable<IProcessor<OrnamentationItem>> Create(CompositionConfiguration compositionConfiguration) =>
         from ornamentationConfiguration in compositionConfiguration.AggregateOrnamentationConfiguration.Configurations.Where(configuration => configuration.IsEnabled)
         from processorConfiguration in configurationFactory.Create(ornamentationConfiguration)
         select PolicyEngineBuilder<OrnamentationItem>.Configure()
             .WithInputPolicies(processorConfiguration.InputPolicies)
             .WithProcessors(new OrnamentationProcessor(musicalTimeSpanCalculator, compositionConfiguration, processorConfiguration))
-            .WithOutputPolicies(new LogOrnamentation(processorConfiguration.OrnamentationType, logger))
+            .WithOutputPolicies(processorConfiguration.OutputPolicies)
             .Build();
 }

src/BaroquenMelody.Library/Ornamentation/Engine/Processors/OrnamentationProcessor.cs

@@ -27,7 +27,7 @@ public void Process(OrnamentationItem item)
         currentNote.OrnamentationType = configuration.OrnamentationType;
     }
 
-    private List<BaroquenNote> GetOrnamentations(BaroquenNote currentNote, BaroquenNote? nextNote)
+    private IEnumerable<BaroquenNote> GetOrnamentations(BaroquenNote currentNote, BaroquenNote? nextNote)
     {
         var shouldInvert = configuration.ShouldInvertTranslations((currentNote, nextNote));
 
@@ -37,35 +37,18 @@ private List<BaroquenNote> GetOrnamentations(BaroquenNote currentNote, BaroquenN
 
         var notes = compositionConfiguration.Scale.GetNotes();
 
-        var ornamentations = new List<BaroquenNote>();
-
-        for (var i = 0; i < configuration.Translations.Length; i++)
-        {
-            var translation = configuration.Translations[i];
-
-            var ornamentationIndex = shouldInvert && configuration.TranslationInversionIndices.Contains(i)
+        return configuration.Translations
+            .Select((translation, translationIndex) => shouldInvert && configuration.TranslationInversionIndices.Contains(translationIndex)
                 ? translationPivot - translation
-                : translationPivot + translation;
-
-            var note = notes[ornamentationIndex];
-            var timespan = musicalTimeSpanCalculator.CalculateOrnamentationTimeSpan(configuration.OrnamentationType, compositionConfiguration.Meter, i);
-
-            ornamentations.Add(new BaroquenNote(currentNote.Instrument, note, timespan));
-        }
-
-        // var ornamentations = configuration.Translations
-        //   .Select((translation, translationIndex) => shouldInvert && configuration.TranslationInversionIndices.Contains(translationIndex)
-        //       ? translationPivot - translation
-        //       : translationPivot + translation
-        //   )
-        //   .Select(noteIndex => notes[noteIndex])
-        //   .Select((note, ornamentationStep) =>
-        //       new BaroquenNote(
-        //           currentNote.Instrument,
-        //           note,
-        //           musicalTimeSpanCalculator.CalculateOrnamentationTimeSpan(configuration.OrnamentationType, compositionConfiguration.Meter, ornamentationStep)
-        //       )
-        //   );
-        return ornamentations;
+                : translationPivot + translation
+            )
+            .Select(noteIndex => notes[noteIndex])
+            .Select((note, ornamentationStep) =>
+                new BaroquenNote(
+                    currentNote.Instrument,
+                    note,
+                    musicalTimeSpanCalculator.CalculateOrnamentationTimeSpan(configuration.OrnamentationType, compositionConfiguration.Meter, ornamentationStep)
+                )
+            );
     }
 }