head_music.rb in head_music-0.16.0

- old
+ new

@@ -1,5 +1,12 @@
+module HeadMusic
+  GOLDEN_RATIO = (1 + 5**0.5) / 2.0
+  GOLDEN_RATIO_INVERSE = 1 / GOLDEN_RATIO
+  PENALTY_FACTOR = GOLDEN_RATIO_INVERSE
+  SMALL_PENALTY_FACTOR = GOLDEN_RATIO_INVERSE**0.5
+end
+
 require 'head_music/version'
 
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/string/access'
 require 'humanize'
@@ -52,36 +59,34 @@
 require 'head_music/style/annotations/consonant_downbeats'
 require 'head_music/style/annotations/diatonic'
 require 'head_music/style/annotations/direction_changes'
 require 'head_music/style/annotations/end_on_perfect_consonance'
 require 'head_music/style/annotations/end_on_tonic'
+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/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'
+require 'head_music/style/annotations/prepare_octave_leaps'
 require 'head_music/style/annotations/recover_large_leaps'
 require 'head_music/style/annotations/singable_intervals'
 require 'head_music/style/annotations/singable_range'
+require 'head_music/style/annotations/single_large_leaps'
 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_up_to_final_note'
-require 'head_music/style/annotations/up_to_thirteen_notes'
+require 'head_music/style/annotations/up_to_fourteen_notes'
 
-require 'head_music/style/rulesets/cantus_firmus'
+require 'head_music/style/rulesets/fux_cantus_firmus'
+require 'head_music/style/rulesets/davis_lybbert_cantus_firmus'
 require 'head_music/style/rulesets/first_species_melody'
 require 'head_music/style/rulesets/first_species_harmony'
 
 require 'head_music/utilities/hash_key'
 require 'head_music/voice'
-
-module HeadMusic
-  GOLDEN_RATIO = (1 + 5**0.5) / 2.0
-  GOLDEN_RATIO_INVERSE = 1 / GOLDEN_RATIO
-  PENALTY_FACTOR = GOLDEN_RATIO_INVERSE
-  SMALL_PENALTY_FACTOR = GOLDEN_RATIO_INVERSE**0.5
-end