Generic Ornamentation Processor (#196)

Author: wbaldoumas

.editorconfig

@@ -52,6 +52,9 @@ dotnet_diagnostic.SA1508.severity = none
 dotnet_diagnostic.SA1502.severity = none
 dotnet_diagnostic.SA1500.severity = none
 
+# MA0051: Method is too long
+dotnet_diagnostic.MA0051.severity = none
+
 # require that opening braces be preceded by a space
 dotnet_diagnostic.SA1012.severity = none
 
@@ -64,6 +67,9 @@ dotnet_diagnostic.SA1201.severity = none
 # force constructor documentation text
 dotnet_diagnostic.SA1642.severity = none
 
+# prevent parameter spanning multiple lines
+dotnet_diagnostic.SA1118.severity = none
+
 # force static members to appear before non-static
 dotnet_diagnostic.SA1204.severity = none
 
@@ -88,6 +94,7 @@ dotnet_diagnostic.SA1600.severity = none
 indent_style = space
 indent_size = 2
 tab_size = 2
+
 [*.{cs,vb}]
 #### Naming styles ####
 

src/BaroquenMelody.Library/Extensions/ServiceCollectionExtensions.cs

@@ -2,7 +2,7 @@
 using BaroquenMelody.Library.Configurations.Services;
 using BaroquenMelody.Library.Midi;
 using BaroquenMelody.Library.Midi.Repositories;
-using BaroquenMelody.Library.Ornamentation.Engine.Processors;
+using BaroquenMelody.Library.Ornamentation.Engine.Processors.Providers;
 using BaroquenMelody.Library.Ornamentation.Utilities;
 using Fluxor;
 using Microsoft.Extensions.DependencyInjection;
@@ -33,5 +33,5 @@ public static IServiceCollection AddBaroquenMelody(this IServiceCollection servi
         .AddSingleton<IMidiExampleGenerator, MidiExampleGenerator>()
         .AddSingleton<IWeightedRandomBooleanGenerator, WeightedRandomBooleanGenerator>()
         .AddSingleton<IMusicalTimeSpanCalculator, MusicalTimeSpanCalculator>()
-        .AddSingleton<IOrnamentationProcessorFactory, OrnamentationProcessorFactory>();
+        .AddSingleton<IOrnamentationProcessorConfigurationFactoryProvider, OrnamentationProcessorConfigurationFactoryProvider>();
 }

src/BaroquenMelody.Library/Midi/MidiExampleGenerator.cs

@@ -4,7 +4,9 @@
 using BaroquenMelody.Library.Midi.Extensions;
 using BaroquenMelody.Library.Ornamentation;
 using BaroquenMelody.Library.Ornamentation.Engine.Processors;
+using BaroquenMelody.Library.Ornamentation.Engine.Processors.Providers;
 using BaroquenMelody.Library.Ornamentation.Enums;
+using BaroquenMelody.Library.Ornamentation.Utilities;
 using Melanchall.DryWetMidi.Common;
 using Melanchall.DryWetMidi.Composing;
 using Melanchall.DryWetMidi.Core;
@@ -14,7 +16,10 @@
 
 namespace BaroquenMelody.Library.Midi;
 
-internal sealed class MidiExampleGenerator(IOrnamentationProcessorFactory ornamentationProcessorFactory) : IMidiExampleGenerator
+internal sealed class MidiExampleGenerator(
+    IMusicalTimeSpanCalculator musicalTimeSpanCalculator,
+    IOrnamentationProcessorConfigurationFactoryProvider ornamentationProcessorConfigurationFactoryProvider
+) : IMidiExampleGenerator
 {
     private const int DefaultTempo = 120;
 
@@ -36,14 +41,18 @@ public MidiFile GenerateExampleNoteMidiFile(GeneralMidi2Program midiProgram, Not
 
     public MidiFile GenerateExampleOrnamentationMidiFile(OrnamentationType ornamentationType, CompositionConfiguration compositionConfiguration)
     {
-        var ornamentationProcessor = ornamentationProcessorFactory.Create(ornamentationType, compositionConfiguration, GetInterval(ornamentationType));
+        var ornamentationConfiguration = compositionConfiguration.AggregateOrnamentationConfiguration.Configurations.First(configuration => configuration.OrnamentationType == ornamentationType);
+        var ornamentationProcessorConfigurationFactory = ornamentationProcessorConfigurationFactoryProvider.Get(compositionConfiguration);
+        var processorConfiguration = ornamentationProcessorConfigurationFactory.Create(ornamentationConfiguration).First();
+        var processor = new OrnamentationProcessor(musicalTimeSpanCalculator, compositionConfiguration, processorConfiguration);
+
         var note = GetNote(ornamentationType, compositionConfiguration);
         var beat = new Beat(new BaroquenChord([note]));
         var nextNote = GetNextNote(ornamentationType, compositionConfiguration);
         var nextBeat = new Beat(new BaroquenChord([nextNote]));
         var ornamentationItem = new OrnamentationItem(note.Instrument, [], beat, nextBeat);
 
-        ornamentationProcessor.Process(ornamentationItem);
+        processor.Process(ornamentationItem);
 
         var patternBuilder = new PatternBuilder().ProgramChange(GeneralMidi2Program.AcousticGrandPiano);
 
@@ -60,13 +69,6 @@ public MidiFile GenerateExampleOrnamentationMidiFile(OrnamentationType ornamenta
         return midiFile;
     }
 
-    private static int GetInterval(OrnamentationType ornamentationType) => ornamentationType switch
-    {
-        OrnamentationType.DecorateInterval => -4,
-        OrnamentationType.Pedal => PedalProcessor.RootPedalInterval,
-        _ => 0
-    };
-
     private static BaroquenNote GetNote(OrnamentationType ornamentationType, CompositionConfiguration compositionConfiguration) => ornamentationType switch
     {
         OrnamentationType.DecorateInterval => new BaroquenNote(Instrument.One, Note.Get(compositionConfiguration.Scale.Supertonic, 4), compositionConfiguration.DefaultNoteTimeSpan),

src/BaroquenMelody.Library/MusicTheory/NoteOnsetCalculator.cs

@@ -23,7 +23,7 @@ public BitArray CalculateNoteOnsets(OrnamentationType ornamentationType)
         var ornamentationCount = ornamentationType.OrnamentationCount();
         var noteOnsetCursor = primaryNoteDuration.DivideBy(_resolution);
 
-        for (var ornamentationStep = 1; ornamentationStep <= ornamentationCount; ornamentationStep++)
+        for (var ornamentationStep = 0; ornamentationStep < ornamentationCount; ornamentationStep++)
         {
             var ornamentationDuration = musicalTimeSpanCalculator.CalculateOrnamentationTimeSpan(ornamentationType, compositionConfiguration.Meter, ornamentationStep);
             var cursorProgressionValue = ornamentationDuration.DivideBy(_resolution);

src/BaroquenMelody.Library/Ornamentation/Cleaning/Engine/Selection/Strategies/CleanTargetOrnamentation.cs

@@ -13,9 +13,7 @@ internal sealed class CleanTargetOrnamentation : IOrnamentationCleaningSelectorS
     /// <param name="note">The primary note to consider for ornamentation cleaning.</param>
     /// <param name="otherNote">The secondary note to consider for ornamentation cleaning.</param>
     /// <returns>The note to clean, or null if the selector could not determine which note to clean.</returns>
-#pragma warning disable MA0051
     private static BaroquenNote? SelectInternal(BaroquenNote note, BaroquenNote otherNote) => (note.OrnamentationType, otherNote.OrnamentationType) switch
-#pragma warning restore MA0051
     {
         (OrnamentationType.DecorateInterval, OrnamentationType.DelayedDoublePassingTone) => note,
         (OrnamentationType.DecorateInterval, OrnamentationType.DelayedNeighborTone) => otherNote,