Add a General Minor scale

Author: michaelphines

scale_filter_generator.rb

@@ -1,12 +1,14 @@
 require 'fileutils'
 require 'zlib'
 require 'shellwords'
+require './scale_filter_note'
 require './scale_filter_device'
 
 class ScaleFilterGenerator
   SCALE_NAMES = {
      major:                  "Major (Ionian)",
      natural_minor:          "Natural Minor (Aeolian)",
+     general_minor:          "General Minor (Aeolian+Harmonic+Melodic)",
      dorian:                 "Dorian",
      phrygian:               "Phrygian",
      lydian:                 "Lydian",
@@ -27,11 +29,11 @@ class ScaleFilterGenerator
 
   class << self
     def flat_note_name(note)
-      Note.flat_twelve_tones[note.value % 12]
+      ScaleFilterNote.flat_twelve_tones[note.value % 12]
     end
 
     def note_label(note_number)
-      note = Note.new(note_number)
+      note = ScaleFilterNote.new(note_number)
       octave = (note_number/12) - 2
       "\u2666 #{note.name}#{octave}"
     end
@@ -53,7 +55,7 @@ def generate_all
         path = "./output/Scale Filters/#{scale_name}"
         FileUtils.mkdir_p(path)
         12.times do |note_number|
-          root_note = Note.new(note_number)
+          root_note = ScaleFilterNote.new(note_number)
           scale = root_note.send("#{scale_identifier}_scale")
           generate_filter(path, "#{root_note.name} #{scale_name} Scale Filter", scale)
           generate_filter(path, "#{flat_note_name(root_note)} #{scale_name} Scale Filter", scale) unless root_note.name == flat_note_name(root_note)

scale_filter_note.rb

@@ -0,0 +1,8 @@
+require './scale_filter_note_interval'
+
+class ScaleFilterNote < Note
+  def general_minor_scale
+    intervals = ScaleFilterNoteInterval.general_minor_set
+    Scale.new(self, intervals)
+  end
+end

scale_filter_note_interval.rb

@@ -0,0 +1,7 @@
+class ScaleFilterNoteInterval < NoteInterval
+  def self.general_minor_set
+    sets = NoteInterval::SCALE_SETS
+    set = sets[:aeolian] | sets[:harmonic_minor] | sets[:melodic_minor]
+    set.map { |n| NoteInterval.new(n) }
+  end
+end