head_music 0.13.2 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1c8d179b57fdcf25212aa045104c235981b7618
-  data.tar.gz: 324f02d328e7f94a35bcce3edf754d186f6f127b
+  metadata.gz: 1f987ca8cb9cdf11cc5f3f44385480ff343c899b
+  data.tar.gz: 261effd060be6679e7c9c766c49c16f1d5fa3c43
 SHA512:
-  metadata.gz: 6d59e0eee2a58b5126bed466801d27bb2f64b93b736057a2802b9b17f133e67b9b60fdbc19aefbd974e5ea6872a9a50095f760b4677e5f31c5631734c47dd977
-  data.tar.gz: 92548ec40646df28b54230aba80dba41bd9470024397b627658e8d27c2026ea6909992effc98d8959fd49e715f1b1750c532e8950edc06b363f4d692f1cb2339
+  metadata.gz: 6b0cd2013873788e4e520d8f8cc0495658903e8eefe54560d27ee7edc2bf0243f70745fe73c288dddd5fd54819e75594723bde4f683d22e73a7cd101fe29b5a7
+  data.tar.gz: 916deb897a49e6dd40c6abdcc9fab8f1bd8cc0f1f06d5cb8bcd8227a1c84d443ab70ef42bc5d46712a5419cee05706821c5f6f0629a512c1856483cbfdb70cee

data/lib/head_music/bar.rb

@@ -11,6 +11,6 @@ class HeadMusic::Bar
   end
 
   def to_s
-    ['Bar', key_signature, meter].reject(&:nil?).join(' ')
+    ['Bar', key_signature, meter].compact.join(' ')
   end
 end

data/lib/head_music/composition.rb

@@ -24,7 +24,7 @@ class HeadMusic::Composition
   def bars(last = latest_bar_number)
     @bars ||= []
     (earliest_bar_number..last).each do |bar_number|
-      @bars[bar_number] ||= Bar.new(self)
+      @bars[bar_number] ||= HeadMusic::Bar.new(self)
     end
     @bars[earliest_bar_number..last]
   end

data/lib/head_music/harmonic_interval.rb

@@ -12,11 +12,11 @@ class HeadMusic::HarmonicInterval
   end
 
   def voices
-    [voice1, voice2].reject(&:nil?)
+    [voice1, voice2].compact
   end
 
   def notes
-    @notes ||= voices.map { |voice| voice.note_at(position) }.reject(&:nil?).sort_by(&:pitch)
+    @notes ||= voices.map { |voice| voice.note_at(position) }.compact.sort_by(&:pitch)
   end
 
   def lower_note
@@ -39,6 +39,16 @@ class HeadMusic::HarmonicInterval
     pitches.last
   end
 
+  def pitch_orientation
+    if lower_pitch < upper_pitch
+      if lower_note.voice == voice1
+        :up
+      elsif lower_note.voice == voice2
+        :down
+      end
+    end
+  end
+
   def to_s
     "#{functional_interval} at #{position}"
   end

data/lib/head_music/melodic_interval.rb

@@ -8,7 +8,7 @@ class HeadMusic::MelodicInterval
   end
 
   def functional_interval
-    @functional_interval ||= HeadMusic::FunctionalInterval.new(first_note.pitch, second_note.pitch)
+    @functional_interval ||= HeadMusic::FunctionalInterval.new(first_pitch, second_pitch)
   end
 
   def position_start

data/lib/head_music/rhythmic_value.rb

@@ -79,12 +79,12 @@ class HeadMusic::RhythmicValue
   end
 
   def single_value_name
-    [name_modifier_prefix, unit_name].reject(&:nil?).join(' ')
+    [name_modifier_prefix, unit_name].compact.join(' ')
   end
 
   def name
     if tied_value
-      [single_value_name, tied_value.name].reject(&:nil?).join(' tied to ')
+      [single_value_name, tied_value.name].compact.join(' tied to ')
     else
       single_value_name
     end

data/lib/head_music/style/annotation.rb

@@ -49,6 +49,8 @@ class HeadMusic::Style::Annotation
     self.class::MESSAGE
   end
 
+  protected
+
   def first_note
     notes && notes.first
   end
@@ -93,17 +95,26 @@ class HeadMusic::Style::Annotation
     downbeat_harmonic_intervals.map.with_index do |harmonic_interval, i|
       next_harmonic_interval = downbeat_harmonic_intervals[i+1]
       HeadMusic::Motion.new(harmonic_interval, next_harmonic_interval) if next_harmonic_interval
-    end.reject(&:nil?)
+    end.compact
   end
 
   def downbeat_harmonic_intervals
-    @downbeat_harmonic_intervals ||= cantus_firmus.notes.map do |cantus_firmus_note|
-      interval = HeadMusic::HarmonicInterval.new(cantus_firmus_note.voice, voice, cantus_firmus_note.position)
-      interval.notes.length == 2 ? interval : nil
-    end.reject(&:nil?)
+    @downbeat_harmonic_intervals ||=
+      cantus_firmus.notes.map { |cantus_firmus_note|
+        HeadMusic::HarmonicInterval.new(cantus_firmus_note.voice, voice, cantus_firmus_note.position)
+      }.reject { |interval| interval.notes.length < 2 }
+  end
+
+  def harmonic_intervals
+    @harmonic_intervals ||=
+      positions.map { |position|
+        HeadMusic::HarmonicInterval.new(cantus_firmus, voice, position)
+      }.reject { |harmonic_interval| harmonic_interval.notes.length < 2 }
   end
 
-  private
+  def positions
+    @positions ||= voices.map(&:notes).flatten.map(&:position).sort.uniq(&:to_s)
+  end
 
   def unsorted_higher_voices
     other_voices.select { |part| part.highest_pitch > highest_pitch }

data/lib/head_music/style/annotations/always_move.rb

@@ -9,6 +9,6 @@ class HeadMusic::Style::Annotations::AlwaysMove < HeadMusic::Style::Annotation
       if interval.shorthand == 'PU'
         HeadMusic::Style::Mark.for_all(notes[i..i+1])
       end
-    end.reject(&:nil?)
+    end.compact
   end
 end

data/lib/head_music/style/annotations/approach_perfection_contrarily.rb

@@ -2,7 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::ApproachPerfectionContrarily < HeadMusic::Style::Annotation
-  MESSAGE = 'Step down to final note.'
+  MESSAGE = 'Approach perfect consonances by contrary motion.'
 
   def marks
     motions_to_perfect_consonance_approached_directly.map do |bad_motion|

data/lib/head_music/style/annotations/avoid_crossing_voices.rb

@@ -5,36 +5,28 @@ class HeadMusic::Style::Annotations::AvoidCrossingVoices < HeadMusic::Style::Ann
   MESSAGE = "Avoid crossing voices."
 
   def marks
-    crossings
+    crossings.map do |crossing|
+      HeadMusic::Style::Mark.for_all(crossing.notes)
+    end
   end
 
   private
 
   def crossings
-    crossings_of_lower_voices + crossings_of_higher_voices
+    harmonic_intervals.select do |harmonic_interval|
+      harmonic_interval.pitch_orientation && harmonic_interval.pitch_orientation != predominant_pitch_orientation
+    end
   end
 
-  def crossings_of_lower_voices
-    [].tap do |marks|
-      lower_voices.each do |lower_voice|
-        lower_voice.notes.each do |lower_voice_note|
-          notes_during = voice.notes_during(lower_voice_note)
-          crossed_notes = notes_during.select { |note| note.pitch < lower_voice_note.pitch }
-          marks << HeadMusic::Style::Mark.for_all(crossed_notes)
-        end
-      end
-    end
+  def predominant_pitch_orientation
+    pitch_orientations
+      .compact
+      .group_by { |orientation| orientation }
+      .max { |a, b| a[1].length <=> b[1].length }
+      .first
   end
 
-  def crossings_of_higher_voices
-    [].tap do |marks|
-      higher_voices.each do |higher_voice|
-        higher_voice.notes.each do |higher_voice_note|
-          notes_during = voice.notes_during(higher_voice_note)
-          crossed_notes = notes_during.select { |note| note.pitch > lower_voice_note.pitch }
-          marks << HeadMusic::Style::Mark.for_all(crossed_notes)
-        end
-      end
-    end
+  def pitch_orientations
+    harmonic_intervals.map(&:pitch_orientation).compact.uniq
   end
 end

data/lib/head_music/style/annotations/avoid_overlapping_voices.rb

@@ -24,7 +24,7 @@ class HeadMusic::Style::Annotations::AvoidOverlappingVoices < HeadMusic::Style::
         end
         marks << HeadMusic::Style::Mark.for_each(overlapped_notes)
       end
-    end
+    end.flatten
   end
 
   def overlappings_of_higher_voices
@@ -32,11 +32,11 @@ class HeadMusic::Style::Annotations::AvoidOverlappingVoices < HeadMusic::Style::
       higher_voices.each do |higher_voice|
         overlapped_notes = voice.notes.select do |note|
           preceding_note = higher_voice.note_preceding(note.position)
-          following_note = lower_voice.note_following(note.position)
+          following_note = higher_voice.note_following(note.position)
           (preceding_note && preceding_note.pitch < note.pitch) || (following_note && following_note.pitch < note.pitch)
         end
         marks << HeadMusic::Style::Mark.for_each(overlapped_notes)
       end
-    end
+    end.flatten
   end
 end

data/lib/head_music/style/annotations/consonant_downbeats.rb

@@ -13,7 +13,7 @@ class HeadMusic::Style::Annotations::ConsonantDownbeats < HeadMusic::Style::Anno
   private
 
   def dissonant_pairs
-    dissonant_intervals.map(&:notes).reject(&:nil?)
+    dissonant_intervals.map(&:notes).compact
   end
 
   def dissonant_intervals

data/lib/head_music/style/annotations/mostly_conjunct.rb

@@ -13,7 +13,7 @@ class HeadMusic::Style::Annotations::MostlyConjunct < HeadMusic::Style::Annotati
   def marks_for_skips_and_leaps
     melodic_intervals.map.with_index do |interval, i|
       HeadMusic::Style::Mark.for_all(notes[i..i+1], fitness: HeadMusic::SMALL_PENALTY_FACTOR) unless interval.step?
-    end.reject(&:nil?)
+    end.compact
   end
 
   def conjunct_ratio

data/lib/head_music/style/annotations/no_unisons_in_middle.rb

@@ -13,7 +13,7 @@ class HeadMusic::Style::Annotations::NoUnisonsInMiddle < HeadMusic::Style::Annot
   private
 
   def unison_pairs
-    middle_unisons.map(&:notes).reject(&:nil?)
+    middle_unisons.map(&:notes).compact
   end
 
   def middle_unisons
@@ -21,19 +21,6 @@ class HeadMusic::Style::Annotations::NoUnisonsInMiddle < HeadMusic::Style::Annot
   end
 
   def middle_intervals
-    [harmonic_intervals[1..-2]].flatten.reject(&:nil?)
-  end
-
-  def harmonic_intervals
-    cantus_firmus.notes.map do |cantus_firmus_note|
-      counterpoint_notes = voice.notes_during(cantus_firmus_note)
-      counterpoint_notes.map { |note|
-        HarmonicInterval.new(cantus_firmus_note.voice, voice, note.position)
-      }
-    end.flatten
-  end
-
-  def positions
-    voices.map(:notes).flatten.map(&:position).sort.uniq
+    [harmonic_intervals[1..-2]].flatten.compact
   end
 end

data/lib/head_music/style/annotations/prefer_imperfect.rb

@@ -2,7 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::PreferImperfect < HeadMusic::Style::Annotation
-  MESSAGE = "Use consonant harmonic intervals."
+  MESSAGE = "Prefer imperfect harmonic intervals."
 
   def marks
     if ratio_of_perfect_intervals > 0.5

data/lib/head_music/style/annotations/recover_large_leaps.rb

@@ -14,7 +14,7 @@ class HeadMusic::Style::Annotations::RecoverLargeLeaps < HeadMusic::Style::Annot
       if unrecovered_leap?(previous_interval, interval)
         HeadMusic::Style::Mark.for_all((previous_interval.notes + interval.notes).uniq)
       end
-    end.reject(&:nil?)
+    end.compact
   end
 
   private

data/lib/head_music/style/annotations/step_out_of_unison.rb

@@ -17,22 +17,15 @@ class HeadMusic::Style::Annotations::StepOutOfUnison < HeadMusic::Style::Annotat
   end
 
   def melodic_intervals_following_unisons
-    unisons.map do |unison|
-      note1 = voice.note_at(unison.position)
-      note2 = voice.note_following(unison.position)
-      MelodicInterval.new(voice, note1, note2) if note2
-    end.reject(&:nil?)
+    @melodic_intervals_following_unisons ||=
+      perfect_unisons.map do |unison|
+        note1 = voice.note_at(unison.position)
+        note2 = voice.note_following(unison.position)
+        HeadMusic::MelodicInterval.new(voice, note1, note2) if note1 && note2
+      end.compact
   end
 
-  def unisons
-    harmonic_intervals.select { |interval| interval.perfect_consonance? && interval.unison? }
-  end
-
-  def harmonic_intervals
-    positions.map { |position| HarmonicInterval.new(cantus_firmus, voice, position) }
-  end
-
-  def positions
-    voices.map(&:notes).flatten.map(&:position).sort.uniq(&:to_s)
+  def perfect_unisons
+    @unisons ||= harmonic_intervals.select(&:perfect_consonance?).select(&:unison?)
   end
 end

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.13.2"
+  VERSION = "0.14.1"
 end

data/lib/head_music/voice.rb

@@ -56,7 +56,7 @@ class HeadMusic::Voice
   def melodic_intervals
     notes.map.with_index do |note, i|
       HeadMusic::MelodicInterval.new(self, notes[i-1], note) if i > 0
-    end.reject(&:nil?)
+    end.compact
   end
 
   def leaps

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.1
 platform: ruby
 authors:
 - Rob Head