Double Pedal Passing Tone Ornamentation (#229)

wbaldoumas · Jan 12, 2025 · a1df86a · a1df86a
1 parent 4ed422f
commit a1df86a
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 3 deletions.
diff --git a/src/BaroquenMelody.Library/Configurations/AggregateOrnamentationConfiguration.cs b/src/BaroquenMelody.Library/Configurations/AggregateOrnamentationConfiguration.cs
@@ -40,7 +40,8 @@ public sealed record AggregateOrnamentationConfiguration(ISet<OrnamentationConfi
             new(OrnamentationType.UpperOctavePedalPassingTone, ConfigurationStatus.Enabled, 80),
             new(OrnamentationType.UpperOctavePedalArpeggio, ConfigurationStatus.Enabled, 80),
             new(OrnamentationType.TriplePickup, ConfigurationStatus.Enabled, 25),
-            new(OrnamentationType.SequencedThirds, ConfigurationStatus.Enabled, 25)
+            new(OrnamentationType.SequencedThirds, ConfigurationStatus.Enabled, 25),
+            new(OrnamentationType.DoublePedalPassingTone, ConfigurationStatus.Enabled, 25)
         }
     );
 }
diff --git a/src/BaroquenMelody.Library/Midi/MidiExampleGenerator.cs b/src/BaroquenMelody.Library/Midi/MidiExampleGenerator.cs
@@ -108,6 +108,7 @@ public MidiFile GenerateExampleOrnamentationMidiFile(OrnamentationType ornamenta
         OrnamentationType.UpperOctavePedalArpeggio => new BaroquenNote(Instrument.One, Note.Get(compositionConfiguration.Scale.Dominant, 4), compositionConfiguration.DefaultNoteTimeSpan),
         OrnamentationType.TriplePickup => new BaroquenNote(Instrument.One, Note.Get(compositionConfiguration.Scale.Mediant, 4), compositionConfiguration.DefaultNoteTimeSpan),
         OrnamentationType.SequencedThirds => new BaroquenNote(Instrument.One, Note.Get(compositionConfiguration.Scale.Subdominant, 3), compositionConfiguration.DefaultNoteTimeSpan),
+        OrnamentationType.DoublePedalPassingTone => new BaroquenNote(Instrument.One, Note.Get(compositionConfiguration.Scale.Dominant, 4), compositionConfiguration.DefaultNoteTimeSpan),
         _ => throw new ArgumentOutOfRangeException(nameof(ornamentationType), ornamentationType, "Ornamentation type not supported.")
     };
 }
diff --git a/...y/Ornamentation/Engine/Processors/Factories/OrnamentationProcessorConfigurationFactory.cs b/...y/Ornamentation/Engine/Processors/Factories/OrnamentationProcessorConfigurationFactory.cs
@@ -30,6 +30,8 @@ ILogger logger
 
     private const int PassingToneInterval = 2;
 
+    private const int DoublePedalPassingToneInterval = 4;
+
     private const int RootPedalInterval = -3;
 
     private const int ThirdPedalInterval = -2;
@@ -654,6 +656,23 @@ public IEnumerable<OrnamentationProcessorConfiguration> Create(OrnamentationConf
                     )
                 );
                 break;
+            case OrnamentationType.DoublePedalPassingTone:
+                processorConfigurations.Add(
+                    new OrnamentationProcessorConfiguration(
+                        OrnamentationType.DoublePedalPassingTone,
+                        InputPolicies:
+                        [
+                            wantsToOrnament,
+                            _hasNoOrnamentation,
+                            new IsApplicableInterval(compositionConfiguration, DoublePedalPassingToneInterval)
+                        ],
+                        OutputPolicies: [logOrnamentation],
+                        Translations: [0, 1, 0, 2, 0, 3, 0],
+                        ShouldInvertBasedOnDirection,
+                        TranslationInversionIndices: new HashSet<int> { 1, 3, 5 }.ToFrozenSet()
+                    )
+                );
+                break;
             case OrnamentationType.None:
             case OrnamentationType.Sustain:
             case OrnamentationType.MidSustain:

diff --git a/src/BaroquenMelody.Library/Ornamentation/Enums/Extensions/OrnamentationTypeExtensions.cs b/src/BaroquenMelody.Library/Ornamentation/Enums/Extensions/OrnamentationTypeExtensions.cs
@@ -37,6 +37,7 @@ internal static class OrnamentationTypeExtensions
         { OrnamentationType.UpperOctavePedalPassingTone, 3 },
         { OrnamentationType.UpperOctavePedalArpeggio, 3 },
         { OrnamentationType.SequencedThirds, 7 },
+        { OrnamentationType.DoublePedalPassingTone, 7 },
         { OrnamentationType.None, 0 },
         { OrnamentationType.Sustain, 0 },
         { OrnamentationType.MidSustain, 0 },

diff --git a/src/BaroquenMelody.Library/Ornamentation/Enums/OrnamentationType.cs b/src/BaroquenMelody.Library/Ornamentation/Enums/OrnamentationType.cs
@@ -176,4 +176,9 @@ public enum OrnamentationType : byte
     ///     A sequence of thirds.
     /// </summary>
     SequencedThirds,
+
+    /// <summary>
+    ///     A double pedal with passing tones connecting two notes.
+    /// </summary>
+    DoublePedalPassingTone
 }
diff --git a/src/BaroquenMelody.Library/Ornamentation/Utilities/MusicalTimeSpanCalculator.cs b/src/BaroquenMelody.Library/Ornamentation/Utilities/MusicalTimeSpanCalculator.cs
@@ -143,6 +143,10 @@ internal sealed class MusicalTimeSpanCalculator : IMusicalTimeSpanCalculator
         OrnamentationType.SequencedThirds when meter == Meter.ThreeFour => MusicalTimeSpan.Quarter + MusicalTimeSpan.Sixteenth,
         OrnamentationType.SequencedThirds when meter == Meter.FiveEight => MusicalTimeSpan.Eighth.Dotted(1),
 
+        OrnamentationType.DoublePedalPassingTone when meter == Meter.FourFour => MusicalTimeSpan.Sixteenth,
+        OrnamentationType.DoublePedalPassingTone when meter == Meter.ThreeFour => MusicalTimeSpan.Quarter + MusicalTimeSpan.Sixteenth,
+        OrnamentationType.DoublePedalPassingTone when meter == Meter.FiveEight => MusicalTimeSpan.Eighth.Dotted(1),
+
         OrnamentationType.MidSustain => Zero,
         OrnamentationType.Rest => Zero,
 
@@ -291,6 +295,10 @@ internal sealed class MusicalTimeSpanCalculator : IMusicalTimeSpanCalculator
         OrnamentationType.SequencedThirds when meter == Meter.ThreeFour => MusicalTimeSpan.Sixteenth,
         OrnamentationType.SequencedThirds when meter == Meter.FiveEight => MusicalTimeSpan.Sixteenth,
 
+        OrnamentationType.DoublePedalPassingTone when meter == Meter.FourFour => MusicalTimeSpan.Sixteenth,
+        OrnamentationType.DoublePedalPassingTone when meter == Meter.ThreeFour => MusicalTimeSpan.Sixteenth,
+        OrnamentationType.DoublePedalPassingTone when meter == Meter.FiveEight => MusicalTimeSpan.Sixteenth,
+
         OrnamentationType.MidSustain => Zero,
         OrnamentationType.Rest => Zero,
 

diff --git a/...quenMelody.Library.Tests/Configuration/Services/OrnamentationConfigurationServiceTests.cs b/...quenMelody.Library.Tests/Configuration/Services/OrnamentationConfigurationServiceTests.cs
@@ -65,7 +65,8 @@ public void ConfigurableOrnamentations_returns_expected_values()
             OrnamentationType.UpperOctavePedalPassingTone,
             OrnamentationType.UpperOctavePedalArpeggio,
             OrnamentationType.TriplePickup,
-            OrnamentationType.SequencedThirds
+            OrnamentationType.SequencedThirds,
+            OrnamentationType.DoublePedalPassingTone
         };
 
         // act
@@ -123,7 +124,8 @@ public void Randomize_dispatches_expected_actions()
             { OrnamentationType.UpperOctavePedalPassingTone, new OrnamentationConfiguration(OrnamentationType.UpperOctavePedalPassingTone, ConfigurationStatus.Enabled, 100) },
             { OrnamentationType.UpperOctavePedalArpeggio, new OrnamentationConfiguration(OrnamentationType.UpperOctavePedalArpeggio, ConfigurationStatus.Enabled, 100) },
             { OrnamentationType.TriplePickup, new OrnamentationConfiguration(OrnamentationType.TriplePickup, ConfigurationStatus.Enabled, 100) },
-            { OrnamentationType.SequencedThirds, new OrnamentationConfiguration(OrnamentationType.SequencedThirds, ConfigurationStatus.Enabled, 100) }
+            { OrnamentationType.SequencedThirds, new OrnamentationConfiguration(OrnamentationType.SequencedThirds, ConfigurationStatus.Enabled, 100) },
+            { OrnamentationType.DoublePedalPassingTone, new OrnamentationConfiguration(OrnamentationType.DoublePedalPassingTone, ConfigurationStatus.Enabled, 100) }
         };
 
         _mockState.Value.Returns(new CompositionOrnamentationConfigurationState(configurations));