head_music 0.16.0 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 445b3a56d6b47014d6baa3d5a194f2721aebd04d
-  data.tar.gz: 5eade45431e7167069a5f669713dab209c70529c
+  metadata.gz: 3eff7c01e7dbb6e69538d9cdcbad34c55fc9f05e
+  data.tar.gz: e78e38ddd5ec3e8c77aae6a9dc371df7183ef29d
 SHA512:
-  metadata.gz: dfaf16a40716354c6364ddcdc749046a8af9800d838f190e829a56a38e9a5ae110757dc2aab69154c0290a279bcd2a7db6a9b7d10f56afc7d99e54f5c3b8a3b7
-  data.tar.gz: 8736a3fb3564809f62b64a5a7e502563ba08a484b15b1b80c8d4540c668b8ebbff1fa8ce077bb4f5be4b921ac53141d497e79bdaec25c0cbcbe170ea58b2cb94
+  metadata.gz: 98da361ccd151df8d8b8d31688a783cbf3586845e06bf5584e6131b0eb657f18f820f0111e86cdd6a38e65770a99a64588e5693d938aa364b317f590f01db330
+  data.tar.gz: 67bfc70343e9c9733671aea1e9d1d80291ee4233e70fe60899e22efe61f8f6132cff06e54804aa34e3b098080db22919ba38a695a615d42219ba04ee2a3f1c74

data/lib/head_music/style/analysis.rb

@@ -19,7 +19,7 @@ module HeadMusic
 
       def fitness
         return 1.0 if annotations.length == 0
-        fitness_scores.inject(:+).to_f / fitness_scores.length
+        @fitness ||= fitness_scores.inject(:+).to_f / fitness_scores.length
       end
 
       def adherent?
@@ -29,7 +29,7 @@ module HeadMusic
       private
 
       def fitness_scores
-        annotations.map(&:fitness)
+        @fitness_scores ||= annotations.map(&:fitness)
       end
     end
   end

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

@@ -2,7 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::AvoidCrossingVoices < HeadMusic::Style::Annotation
-  MESSAGE = "Avoid crossing voices."
+  MESSAGE = "Avoid crossing voices. Maintain the high-low relationship between voices."
 
   def marks
     crossings.map do |crossing|

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

@@ -2,7 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::AvoidOverlappingVoices < HeadMusic::Style::Annotation
-  MESSAGE = "Avoid overlapping voices."
+  MESSAGE = "Avoid overlapping voices. Maintain the high-low relationship between voices even for adjacent notes."
 
   def marks
     overlappings

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

@@ -2,7 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::ConsonantClimax < HeadMusic::Style::Annotation
-  MESSAGE = "Peak on a consonant high note one time or twice with a step between."
+  MESSAGE = "Peak on a consonant high or low note one time or twice with a step between."
 
   def marks
     HeadMusic::Style::Mark.for_each(highest_notes) if !adherent_climax?
@@ -11,7 +11,7 @@ class HeadMusic::Style::Annotations::ConsonantClimax < HeadMusic::Style::Annotat
   private
 
   def adherent_climax?
-    adherent_high_pitch? || adherent_low_pitch?
+    descending_melody? ? adherent_low_pitch? : adherent_high_pitch?
   end
 
   def adherent_high_pitch?
@@ -21,7 +21,6 @@ class HeadMusic::Style::Annotations::ConsonantClimax < HeadMusic::Style::Annotat
 
   def adherent_low_pitch?
     notes? &&
-    only_goes_down? &&
     lowest_pitch_consonant_with_tonic? &&
       ( lowest_pitch_appears_once? || lowest_pitch_appears_twice_with_step_between? )
   end
@@ -101,7 +100,14 @@ class HeadMusic::Style::Annotations::ConsonantClimax < HeadMusic::Style::Annotat
     notes[(indexes.first + 1)..(indexes.last - 1)] || []
   end
 
-  def only_goes_down?
-    first_note && first_note.pitch == highest_pitch
+  def descending_melody?
+    # account for the possibility of opening with an octave leap
+    notes.length > 1 &&
+    [first_note.pitch, second_note.pitch].include?(highest_pitch) &&
+    highest_pitch.spelling == tonic_spelling
+  end
+
+  def second_note
+    notes && notes[1]
   end
 end

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

@@ -2,7 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::ConsonantDownbeats < HeadMusic::Style::Annotation
-  MESSAGE = "Use consonant harmonic intervals."
+  MESSAGE = "Use consonant harmonic intervals on every downbeat."
 
   def marks
     dissonant_pairs.map do |dissonant_pair|

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

@@ -3,7 +3,7 @@ end
 
 # marks the voice if the first note is not the first or fifth scale degree of the key.
 class HeadMusic::Style::Annotations::EndOnPerfectConsonance < HeadMusic::Style::Annotation
-  MESSAGE = 'End on the tonic or the fifth scale degree.'
+  MESSAGE = 'End on the first or the fifth scale degree.'
 
   def marks
     if last_note && !ends_on_perfect_consonance?

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

@@ -2,7 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::EndOnTonic < HeadMusic::Style::Annotation
-  MESSAGE = 'End on the tonic.'
+  MESSAGE = 'End on the first scale degree.'
 
   def marks
     if !notes.empty? && !ends_on_tonic?

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

@@ -2,7 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::LimitOctaveLeaps < HeadMusic::Style::Annotation
-  MESSAGE = "Use a maximum of one octave skip."
+  MESSAGE = "Use a maximum of one octave leap."
 
   def marks
     if octave_leaps.length > 1

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

@@ -2,7 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::NoRests < HeadMusic::Style::Annotation
-  MESSAGE = "Use only notes."
+  MESSAGE = "Place a note in each measure."
 
   def marks
     HeadMusic::Style::Mark.for_each(rests)

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

@@ -2,7 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::PreferContraryMotion < HeadMusic::Style::Annotation
-  MESSAGE = "Prefer contrary motion."
+  MESSAGE = "Prefer contrary motion. Move voices in different melodic directions."
 
   def marks
     return nil if notes.length < 2

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

@@ -14,7 +14,7 @@ class HeadMusic::Style::Annotations::PrepareOctaveLeaps < HeadMusic::Style::Anno
 
   def external_entries
     melodic_intervals.map.with_index do |melodic_interval, i|
-      if melodic_interval.octave? && (i == 0 || !melodic_interval.spans?(notes[i-1].pitch))
+      if melodic_interval.octave? && i > 0 && !melodic_interval.spans?(notes[i-1].pitch)
         notes[[i-1, 0].max..(i+1)]
       end
     end.compact

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

@@ -6,7 +6,7 @@ end
 # unless another leap (in either direction) creates a consonant triad.
 # - Brian
 class HeadMusic::Style::Annotations::RecoverLargeLeaps < HeadMusic::Style::Annotation
-  MESSAGE = "Recover leaps by step in the opposite direction."
+  MESSAGE = "Recover large leaps by step in the opposite direction."
 
   def marks
     melodic_intervals.drop(1).to_a.map.with_index do |interval, i|

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

@@ -2,7 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::StartOnTonic < HeadMusic::Style::Annotation
-  MESSAGE = 'Start on the tonic.'
+  MESSAGE = 'Start on the first scale degree.'
 
   def marks
     if first_note && !starts_on_tonic?

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

@@ -2,7 +2,7 @@ module HeadMusic::Style::Annotations
 end
 
 class HeadMusic::Style::Annotations::StepDownToFinalNote < HeadMusic::Style::Annotation
-  MESSAGE = 'Step down to final note.'
+  MESSAGE = 'Step down to the final note.'
 
   def marks
     if !last_melodic_interval.nil?

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

@@ -0,0 +1,20 @@
+module HeadMusic::Style::Annotations
+end
+
+class HeadMusic::Style::Annotations::StepToFinalNote < HeadMusic::Style::Annotation
+  MESSAGE = 'Step to the final note.'
+
+  def marks
+    HeadMusic::Style::Mark.for_all(notes[-2..-1]) unless step_to_final_note?
+  end
+
+  private
+
+  def step_to_final_note?
+    last_melodic_interval && last_melodic_interval.step?
+  end
+
+  def last_melodic_interval
+    @last_melodic_interval ||= melodic_intervals.last
+  end
+end

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

@@ -4,7 +4,7 @@ end
 class HeadMusic::Style::Annotations::UpToFourteenNotes < HeadMusic::Style::Annotation
   MAXIMUM_NOTES = 14
 
-  MESSAGE = 'Write up to thirteen notes.'
+  MESSAGE = 'Write up to fourteen notes.'
 
   def marks
     if overage > 0

data/lib/head_music/style/rulesets/first_species_harmony.rb

@@ -7,10 +7,10 @@ class HeadMusic::Style::Rulesets::FirstSpeciesHarmony
     HeadMusic::Style::Annotations::AvoidCrossingVoices,
     HeadMusic::Style::Annotations::AvoidOverlappingVoices,
     HeadMusic::Style::Annotations::ConsonantDownbeats,
-    HeadMusic::Style::Annotations::PreferContraryMotion,
-    HeadMusic::Style::Annotations::PreferImperfect,
     HeadMusic::Style::Annotations::NoUnisonsInMiddle,
     HeadMusic::Style::Annotations::OneToOne,
+    HeadMusic::Style::Annotations::PreferContraryMotion,
+    HeadMusic::Style::Annotations::PreferImperfect,
   ]
 
   def self.analyze(voice)

data/lib/head_music/style/rulesets/{davis_lybbert_cantus_firmus.rb → modern_cantus_firmus.rb}

@@ -1,7 +1,7 @@
 module HeadMusic::Style::Rulesets
 end
 
-class HeadMusic::Style::Rulesets::DavisLybbertCantusFirmus
+class HeadMusic::Style::Rulesets::ModernCantusFirmus
   RULESET = [
     HeadMusic::Style::Annotations::AlwaysMove,
     HeadMusic::Style::Annotations::AtLeastEightNotes,
@@ -18,7 +18,7 @@ class HeadMusic::Style::Rulesets::DavisLybbertCantusFirmus
     HeadMusic::Style::Annotations::SingableRange,
     HeadMusic::Style::Annotations::SingleLargeLeaps,
     HeadMusic::Style::Annotations::StartOnTonic,
-    HeadMusic::Style::Annotations::StepDownToFinalNote,
+    HeadMusic::Style::Annotations::StepToFinalNote,
     HeadMusic::Style::Annotations::UpToFourteenNotes,
   ]
 

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "0.16.0"
+  VERSION = "0.16.2"
 end

data/lib/head_music/voice.rb

@@ -54,9 +54,10 @@ class HeadMusic::Voice
   end
 
   def melodic_intervals
-    notes.map.with_index do |note, i|
-      HeadMusic::MelodicInterval.new(self, notes[i-1], note) if i > 0
-    end.compact
+    @melodic_intervals ||=
+      notes.map.with_index do |note, i|
+        HeadMusic::MelodicInterval.new(self, notes[i-1], note) if i > 0
+      end.compact
   end
 
   def leaps

data/lib/head_music.rb

@@ -65,9 +65,9 @@ require 'head_music/style/annotations/frequent_direction_changes'
 require 'head_music/style/annotations/limit_octave_leaps'
 require 'head_music/style/annotations/moderate_direction_changes'
 require 'head_music/style/annotations/mostly_conjunct'
+require 'head_music/style/annotations/notes_same_length'
 require 'head_music/style/annotations/no_rests'
 require 'head_music/style/annotations/no_unisons_in_middle'
-require 'head_music/style/annotations/notes_same_length'
 require 'head_music/style/annotations/one_to_one'
 require 'head_music/style/annotations/prefer_contrary_motion'
 require 'head_music/style/annotations/prefer_imperfect'
@@ -80,11 +80,12 @@ require 'head_music/style/annotations/start_on_perfect_consonance'
 require 'head_music/style/annotations/start_on_tonic'
 require 'head_music/style/annotations/step_down_to_final_note'
 require 'head_music/style/annotations/step_out_of_unison'
+require 'head_music/style/annotations/step_to_final_note'
 require 'head_music/style/annotations/step_up_to_final_note'
 require 'head_music/style/annotations/up_to_fourteen_notes'
 
 require 'head_music/style/rulesets/fux_cantus_firmus'
-require 'head_music/style/rulesets/davis_lybbert_cantus_firmus'
+require 'head_music/style/rulesets/modern_cantus_firmus'
 require 'head_music/style/rulesets/first_species_melody'
 require 'head_music/style/rulesets/first_species_harmony'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.2
 platform: ruby
 authors:
 - Rob Head
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -181,13 +181,14 @@ files:
 - lib/head_music/style/annotations/start_on_tonic.rb
 - lib/head_music/style/annotations/step_down_to_final_note.rb
 - lib/head_music/style/annotations/step_out_of_unison.rb
+- lib/head_music/style/annotations/step_to_final_note.rb
 - lib/head_music/style/annotations/step_up_to_final_note.rb
 - lib/head_music/style/annotations/up_to_fourteen_notes.rb
 - lib/head_music/style/mark.rb
-- lib/head_music/style/rulesets/davis_lybbert_cantus_firmus.rb
 - lib/head_music/style/rulesets/first_species_harmony.rb
 - lib/head_music/style/rulesets/first_species_melody.rb
 - lib/head_music/style/rulesets/fux_cantus_firmus.rb
+- lib/head_music/style/rulesets/modern_cantus_firmus.rb
 - lib/head_music/utilities/hash_key.rb
 - lib/head_music/version.rb
 - lib/head_music/voice.rb