musicality 0.3.0 → 0.5.0

data/spec/notation/parsing/articulation_parsing_spec.rb

@@ -3,14 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 describe Parsing::ArticulationParser do
   parser = Parsing::ArticulationParser.new
   
-  {
-    '=' => SLUR,
-    '|' => LEGATO,
-    '_' => TENUTO,
-    '%' => PORTATO,
-    '.' => STACCATO,
-    "'" => STACCATISSIMO
-  }.each do |str,art|
+  ARTICULATION_SYMBOLS.each do |art,str|
     res = parser.parse(str)
     it "should parse '#{str}'" do
       res.should_not be nil

data/spec/notation/parsing/convenience_methods_spec.rb

@@ -9,7 +9,7 @@ class_cases = { Duration => {
   Note => {
     '/2' => Note::half,
     '99/10C2' => Note.new('99/10'.to_r, [C2]),
-    '5/2.Db4,Eb5' => Note.new('5/2'.to_r, [Db4,Eb5], articulation:STACCATO) 
+    '5/2Db4,Eb5.' => Note.new('5/2'.to_r, [Db4,Eb5], articulation:STACCATO) 
   },
   Pitch => {
     'C2' => C2,

data/spec/notation/parsing/link_nodes_spec.rb

@@ -4,10 +4,9 @@ describe Parsing::LinkNode do
   parser = Parsing::LinkParser.new
   
   {
-    '=C4' => Link::Slur.new(C4),
-    '/Db2' => Link::Portamento.new(Db2),
-    '~C#2' => Link::Glissando.new(Db2),
-    '|Db2' => Link::Legato.new(Db2),
+    LINK_SYMBOLS[Links::TIE] => Link::Tie.new,
+    (LINK_SYMBOLS[Links::GLISSANDO] + Db2.to_s) => Link::Glissando.new(Db2),
+    (LINK_SYMBOLS[Links::PORTAMENTO] + Db2.to_s) => Link::Portamento.new(Db2),
   }.each do |str,tgt|
     res = parser.parse(str)
     context str do

data/spec/notation/parsing/link_parsing_spec.rb

@@ -5,9 +5,15 @@ describe Parsing::LinkParser do
     @parser = Parsing::LinkParser.new
   end
   
-  ["=C2","|C2","~C2","/C2"].each do |str|
-    it "should parse #{str}" do
-      @parser.should parse(str)
-    end
+  it "should parse #{LINK_SYMBOLS[Links::TIE]}" do
+    @parser.should parse(LINK_SYMBOLS[Links::TIE])
+  end
+
+  it "should parse #{LINK_SYMBOLS[Links::GLISSANDO]} with target pitch" do
+    @parser.should parse(LINK_SYMBOLS[Links::GLISSANDO] + C3.to_s)
+  end
+
+  it "should parse #{LINK_SYMBOLS[Links::PORTAMENTO]} with target pitch" do
+    @parser.should parse(LINK_SYMBOLS[Links::GLISSANDO] + C3.to_s)
   end
 end

data/spec/notation/parsing/note_node_spec.rb

@@ -32,10 +32,10 @@ describe Parsing::NoteNode do
 
   context 'monophonic note' do
     {
-      '/2=C2=C2' => Note.new(Rational(1,2),[C2],articulation:SLUR, links:{C2=>Link::Slur.new(C2)}),
-      '4/2.D#6' => Note.new(Rational(4,2),[Eb6],articulation:STACCATO),
-      '28%Eb7!' => Note.new(Rational(28,1),[Eb7],articulation:PORTATO, accented: true),
-      "56/33'B1" => Note.new(Rational(56,33),[B1],articulation:STACCATISSIMO),
+      '/2C2=' => Note.new(Rational(1,2),[C2], links: { C2 => Link::Tie.new}),
+      '4/2D#6.' => Note.new(Rational(4,2),[Eb6],articulation:STACCATO),
+      '28Eb7%!' => Note.new(Rational(28,1),[Eb7],articulation:PORTATO, accented: true),
+      "56/33B1'" => Note.new(Rational(56,33),[B1],articulation:STACCATISSIMO),
     }.each do |str,tgt|
       res = NOTE_PARSER.parse(str)
       
@@ -60,9 +60,10 @@ describe Parsing::NoteNode do
 
   context 'polyphonic note' do
     {
-      '/2C2,D2,E2|F2' => Note.new(Rational(1,2),[C2,D2,E2],links:{E2=>Link::Legato.new(F2)}),
-      '4/2.D#6,G4' => Note.new(Rational(4,2),[Eb6,G4], articulation:STACCATO),
-      '28_Eb7,D7,G7' => Note.new(Rational(28,1),[Eb7,D7,G7],articulation:TENUTO),
+      '/2C2,D2,E2(' => Note.new(Rational(1,2),[C2,D2,E2],articulation: Articulations::SLUR),
+      '/2C2,D2,E2[' => Note.new(Rational(1,2),[C2,D2,E2],articulation: Articulations::LEGATO),
+      '4/2D#6,G4.' => Note.new(Rational(4,2),[Eb6,G4], articulation: Articulations::STACCATO),
+      '28Eb7,D7,G7_' => Note.new(Rational(28,1),[Eb7,D7,G7],articulation: Articulations::TENUTO),
       '56/33B1,B2,B3,B4,B5!' => Note.new(Rational(56,33),[B1,B2,B3,B4,B5], accented: true),
     }.each do |str,tgt|
       res = NOTE_PARSER.parse(str)

data/spec/notation/parsing/note_parsing_spec.rb

@@ -7,25 +7,22 @@ describe Parsing::NoteParser do
   
    valid_cases = {
     'duration only' => ['1/4','/2','1','55/33'],
-    'duration + accent' => ['1/4!','/2!'],
-    'duration + articulation' => ['1/4.','/2%','2/3='],
-    'duration + articulation + accent' => ['1/4.!','/2%!','2/3=!'],
     'single pitch' => ['/4C2','5/3Db3','/33E#8'],
     'multiple pitches' => ['/4C2,C3,c5','5/3Db3,Bb2,E5','/33E#8,F1,B9'],
-    'with articulation' => ['/4.C2',"5/3'Db3,Bb2,E5",'/33=F3','5|B2','/2_D3,F4'],
+    'with articulation' => ['/4C2.',"5/3Db3,Bb2,E5'",'/33F3(','/2D3,F4_'],
     'with accent' => ['/4C2!','3/2Db3,Bb4!'],
-    'with links' => ['/2C2=','/2C2=D2','/4D4|E4,G4~A5'],
+    'with links' => ['/2C2=','/2C2|D2','/4D4|E4,G4~A5.'],
     'with single pitch + articulation + link + accent' => [
-      '3/4.D2=!','5/8=F2=!','/8Db4|Db5!','/3_G4~B4!'],
+      '3/4D2=(!','5/8F2~G2.!','/8Db4|Db5!','/3G4~B4_!'],
     'with multiple pitches + articulation + links + accent' => [
-      '5/4.D2=,G4|A4,C3~D3!','5/8|F2=D4,B4/A4!'],
+      '5/4D2=,G4|A4,C3~D3.!','5/8F2=,B4|A4_!'],
   }
   invalid_cases = {
-    'single pitch' => ['5/3Hb|3','/33E|2'],
-    'multiple pitches' => ['5/3Db3,Bb|1,E5','/33H8,F1,B9'],
-    'with articulation' => ['/4[C2',"5/3>Db3"],
-    'with accent' => ['/4C2['],
-    'with links' => ['/2C2)'],
+    'duration + accent' => ['1/4!','/2!'],
+    'duration + articulation' => ['1/4.','/2%','2/3('],
+    'duration + accent + link' => ['1/4!~','/2!/','2/3=!'],
+    'single pith with bad letter' => ['5/3Hb3'],
+    'single pitch without octave' => ['/33E(2'],
   }
   
   valid_cases.each do |descr, strs|

data/spec/performance/conversion/score_collator_spec.rb

@@ -15,7 +15,7 @@ describe ScoreCollator do
         it 'should not be included in the part' do
           score = Score::Measured.new(FOUR_FOUR, 120,
             parts: {1 => @part},
-            program: Program.new(["1/4".to_r..."5/4".to_r]))
+            program: ["1/4".to_r..."5/4".to_r])
           collator = ScoreCollator.new(score)
           parts = collator.collate_parts
           notes = parts[1].notes
@@ -29,7 +29,7 @@ describe ScoreCollator do
         it 'should not be included in the part, and a rest is inserted' do
           score = Score::Measured.new(FOUR_FOUR, 120,
             parts: {1 => @part},
-            program: Program.new(["1/8".to_r..."5/4".to_r]))
+            program: ["1/8".to_r..."5/4".to_r])
           collator = ScoreCollator.new(score)
           parts = collator.collate_parts
           notes = parts[1].notes
@@ -47,7 +47,7 @@ describe ScoreCollator do
         it 'should not be included in the part' do
           score = Score::Measured.new(FOUR_FOUR, 120,
             parts: {1 => @part},
-            program: Program.new([0.to_r..."3/4".to_r]))
+            program: [0.to_r..."3/4".to_r])
           collator = ScoreCollator.new(score)
           parts = collator.collate_parts
           notes = parts[1].notes
@@ -59,7 +59,7 @@ describe ScoreCollator do
         it 'should be included in the part, but truncated' do
           score = Score::Measured.new(FOUR_FOUR, 120,
             parts: {1 => @part},
-            program: Program.new([0.to_r...1.to_r]))
+            program: [0.to_r...1.to_r])
           collator = ScoreCollator.new(score)
           parts = collator.collate_parts
           notes = parts[1].notes
@@ -72,7 +72,7 @@ describe ScoreCollator do
         it 'should insert a rest between last note end and segment end' do
           score = Score::Measured.new(FOUR_FOUR, 120,
             parts: {1 => @part},
-            program: Program.new([0.to_r..."6/4".to_r]))
+            program: [0.to_r..."6/4".to_r])
           collator = ScoreCollator.new(score)
           parts = collator.collate_parts
           notes = parts[1].notes
@@ -89,7 +89,7 @@ describe ScoreCollator do
           parts: { 1 => Part.new(Dynamics::FF, dynamic_changes: {
             2 => Change::Gradual.linear(Dynamics::PP,5).trim(1,0)
           }) },
-          program: Program.new([7...9])
+          program: [7...9]
         )
         collator = ScoreCollator.new(score)
         parts = collator.collate_parts
@@ -97,7 +97,7 @@ describe ScoreCollator do
         dcs.size.should eq(1)
         dcs[0.to_r].should eq(Change::Immediate.new(Dynamics::PP))
         
-        score.program = Program.new([0...1])
+        score.program = [0...1]
         collator = ScoreCollator.new(score)
         parts = collator.collate_parts
         dcs = parts[1].dynamic_changes
@@ -110,7 +110,7 @@ describe ScoreCollator do
           parts: { 1 => Part.new(Dynamics::FF, dynamic_changes: {
             2 => Change::Gradual.linear(Dynamics::PP,5).trim(1,1)
           }) },
-          program: Program.new([3...4])
+          program: [3...4]
         )
         collator = ScoreCollator.new(score)
         parts = collator.collate_parts
@@ -125,7 +125,7 @@ describe ScoreCollator do
       score = Score::Measured.new(
         FOUR_FOUR,120,
         parts: { "lead" => Part.new(Dynamics::MP, notes: notes) },
-        program: Program.new([0..1,0..1]),
+        program: [0..1,0..1],
       )
       collator = ScoreCollator.new(score)
       parts = collator.collate_parts
@@ -149,7 +149,7 @@ describe ScoreCollator do
     context 'tempo change starts at end of program segment' do
       it 'should not be included in the tempo changes' do
         score = Score::Measured.new(FOUR_FOUR, 120, tempo_changes: {
-          1 => @change1, 2 => @change2 }, program: Program.new([0..2]))
+          1 => @change1, 2 => @change2 }, program: [0..2])
         collator = ScoreCollator.new(score)
         tcs = collator.collate_tempo_changes
         tcs.size.should eq 2
@@ -161,7 +161,7 @@ describe ScoreCollator do
     context 'tempo change starts and ends before segment' do
       before :all do
         score = Score::Measured.new(FOUR_FOUR, 120, tempo_changes: {
-          2 => @change2 }, program: Program.new([4..5]))
+          2 => @change2 }, program: [4..5])
         collator = ScoreCollator.new(score)
         @tcs = collator.collate_tempo_changes
       end
@@ -179,7 +179,7 @@ describe ScoreCollator do
     context 'tempo change starts before segment, but ends during segment' do
       it 'should e included in the tempo changes, but truncated' do
         score = Score::Measured.new(FOUR_FOUR, 120, tempo_changes: {
-          1.5.to_r => @change2 }, program: Program.new([2..4]))
+          1.5.to_r => @change2 }, program: [2..4])
         collator = ScoreCollator.new(score)
         tcs = collator.collate_tempo_changes
         tcs.size.should eq 1
@@ -192,7 +192,7 @@ describe ScoreCollator do
     context 'tempo change starts during segment, lasts until after' do
       it 'should be included in the tempo changes, but truncated' do
         score = Score::Measured.new(FOUR_FOUR, 120, tempo_changes: {
-          1 => @change1, 2 => @change2 }, program: Program.new([0..2.5]))
+          1 => @change1, 2 => @change2 }, program: [0..2.5])
         collator = ScoreCollator.new(score)
         tcs = collator.collate_tempo_changes
         tcs.size.should eq 3
@@ -211,7 +211,7 @@ describe ScoreCollator do
       change1 = Change::Immediate.new(THREE_FOUR)
       change2 = Change::Immediate.new(SIX_EIGHT)
       score = Score::Measured.new(FOUR_FOUR, 120, meter_changes: {
-        1 => change1, 2 => change2 }, program: Program.new([0...2]))
+        1 => change1, 2 => change2 }, program: [0...2])
       collator = ScoreCollator.new(score)
       tcs = collator.collate_meter_changes
       tcs.size.should eq 2

data/spec/performance/midi/midi_util_spec.rb

@@ -43,6 +43,32 @@ describe MidiUtil do
       end
     end
   end
+
+  describe '.notenum_to_pitch' do
+    context 'given 60' do
+      it 'should return C4' do
+        MidiUtil.notenum_to_pitch(60).should eq(C4)
+      end
+    end
+    
+    context 'given 69' do
+      it 'should return A4' do
+        MidiUtil.notenum_to_pitch(69).should eq(A4)
+      end
+    end
+    
+    context 'given 0' do
+      it 'should return octave below C0' do
+        MidiUtil.notenum_to_pitch(0).should eq(Pitch.new(octave:-1))
+      end
+    end
+    
+    context 'given 127' do
+      it 'should return G9' do
+        MidiUtil.notenum_to_pitch(127).should eq(G9)
+      end
+    end    
+  end
   
   describe '.dynamic_to_volume' do
     context 'given 0' do

data/spec/performance/midi/score_sequencer_spec.rb

@@ -10,7 +10,7 @@ describe ScoreSequencer do
       @part2_name = "def"
       @part1 = Part.new(Dynamics::PP, notes: "/4C4 /4D4 /8 /8D4 /8E4 3/8C4".to_notes * 2)
       @part2 = Part.new(Dynamics::FF, notes: "/4E4 3/4F4 /4E4".to_notes * 2)
-      @score = Score::Timed.new(program: Program.new([0..2.5]),
+      @score = Score::Timed.new(program: [0..2.5],
                                 parts: {@part1_name => @part2, @part2_name => @part2})
       @instr_map = {@part1_name => 33, @part2_name => 25}
       @midi_seq = ScoreSequencer.new(@score).make_midi_seq(@instr_map)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musicality
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,11 +129,29 @@ files:
 - README.md
 - Rakefile
 - bin/midify
-- examples/hip.rb
-- examples/missed_connection.rb
-- examples/song1.rb
-- examples/song2.rb
+- examples/composition/auto_counterpoint.rb
+- examples/composition/part_generator.rb
+- examples/composition/scale_exercise.rb
+- examples/notation/hip.rb
+- examples/notation/missed_connection.rb
+- examples/notation/song1.rb
+- examples/notation/song2.rb
 - lib/musicality.rb
+- lib/musicality/composition/generation/counterpoint_generator.rb
+- lib/musicality/composition/generation/random_rhythm_generator.rb
+- lib/musicality/composition/model/pitch_class.rb
+- lib/musicality/composition/model/pitch_classes.rb
+- lib/musicality/composition/model/scale.rb
+- lib/musicality/composition/model/scale_class.rb
+- lib/musicality/composition/model/scale_classes.rb
+- lib/musicality/composition/note_generation.rb
+- lib/musicality/composition/transposition.rb
+- lib/musicality/composition/util/adding_sequence.rb
+- lib/musicality/composition/util/biinfinite_sequence.rb
+- lib/musicality/composition/util/compound_sequence.rb
+- lib/musicality/composition/util/probabilities.rb
+- lib/musicality/composition/util/random_sampler.rb
+- lib/musicality/composition/util/repeating_sequence.rb
 - lib/musicality/errors.rb
 - lib/musicality/notation/conversion/change_conversion.rb
 - lib/musicality/notation/conversion/measure_note_map.rb
@@ -145,17 +163,17 @@ files:
 - lib/musicality/notation/model/change.rb
 - lib/musicality/notation/model/dynamics.rb
 - lib/musicality/notation/model/link.rb
+- lib/musicality/notation/model/links.rb
 - lib/musicality/notation/model/meter.rb
 - lib/musicality/notation/model/meters.rb
 - lib/musicality/notation/model/note.rb
 - lib/musicality/notation/model/part.rb
 - lib/musicality/notation/model/pitch.rb
 - lib/musicality/notation/model/pitches.rb
-- lib/musicality/notation/model/program.rb
 - lib/musicality/notation/model/score.rb
+- lib/musicality/notation/model/symbols.rb
 - lib/musicality/notation/packing/change_packing.rb
 - lib/musicality/notation/packing/part_packing.rb
-- lib/musicality/notation/packing/program_packing.rb
 - lib/musicality/notation/packing/score_packing.rb
 - lib/musicality/notation/parsing/articulation_parsing.rb
 - lib/musicality/notation/parsing/articulation_parsing.treetop
@@ -202,13 +220,32 @@ files:
 - lib/musicality/performance/midi/midi_util.rb
 - lib/musicality/performance/midi/part_sequencer.rb
 - lib/musicality/performance/midi/score_sequencer.rb
+- lib/musicality/performance/midi/score_sequencing.rb
 - lib/musicality/performance/model/note_attacks.rb
 - lib/musicality/performance/model/note_sequence.rb
 - lib/musicality/performance/util/note_linker.rb
 - lib/musicality/performance/util/optimization.rb
+- lib/musicality/printing/lilypond/errors.rb
+- lib/musicality/printing/lilypond/meter_engraving.rb
+- lib/musicality/printing/lilypond/note_engraving.rb
+- lib/musicality/printing/lilypond/part_engraver.rb
+- lib/musicality/printing/lilypond/pitch_engraving.rb
+- lib/musicality/printing/lilypond/score_engraver.rb
 - lib/musicality/validatable.rb
 - lib/musicality/version.rb
 - musicality.gemspec
+- spec/composition/generation/random_rhythm_generator_spec.rb
+- spec/composition/model/pitch_class_spec.rb
+- spec/composition/model/pitch_classes_spec.rb
+- spec/composition/model/scale_class_spec.rb
+- spec/composition/model/scale_spec.rb
+- spec/composition/note_generation_spec.rb
+- spec/composition/transposition_spec.rb
+- spec/composition/util/adding_sequence_spec.rb
+- spec/composition/util/compound_sequence_spec.rb
+- spec/composition/util/probabilities_spec.rb
+- spec/composition/util/random_sampler_spec.rb
+- spec/composition/util/repeating_sequence_spec.rb
 - spec/musicality_spec.rb
 - spec/notation/conversion/change_conversion_spec.rb
 - spec/notation/conversion/measure_note_map_spec.rb
@@ -222,11 +259,9 @@ files:
 - spec/notation/model/note_spec.rb
 - spec/notation/model/part_spec.rb
 - spec/notation/model/pitch_spec.rb
-- spec/notation/model/program_spec.rb
 - spec/notation/model/score_spec.rb
 - spec/notation/packing/change_packing_spec.rb
 - spec/notation/packing/part_packing_spec.rb
-- spec/notation/packing/program_packing_spec.rb
 - spec/notation/packing/score_packing_spec.rb
 - spec/notation/parsing/articulation_parsing_spec.rb
 - spec/notation/parsing/convenience_methods_spec.rb
@@ -285,6 +320,18 @@ signing_key:
 specification_version: 4
 summary: Music notation, composition, and performance
 test_files:
+- spec/composition/generation/random_rhythm_generator_spec.rb
+- spec/composition/model/pitch_class_spec.rb
+- spec/composition/model/pitch_classes_spec.rb
+- spec/composition/model/scale_class_spec.rb
+- spec/composition/model/scale_spec.rb
+- spec/composition/note_generation_spec.rb
+- spec/composition/transposition_spec.rb
+- spec/composition/util/adding_sequence_spec.rb
+- spec/composition/util/compound_sequence_spec.rb
+- spec/composition/util/probabilities_spec.rb
+- spec/composition/util/random_sampler_spec.rb
+- spec/composition/util/repeating_sequence_spec.rb
 - spec/musicality_spec.rb
 - spec/notation/conversion/change_conversion_spec.rb
 - spec/notation/conversion/measure_note_map_spec.rb
@@ -298,11 +345,9 @@ test_files:
 - spec/notation/model/note_spec.rb
 - spec/notation/model/part_spec.rb
 - spec/notation/model/pitch_spec.rb
-- spec/notation/model/program_spec.rb
 - spec/notation/model/score_spec.rb
 - spec/notation/packing/change_packing_spec.rb
 - spec/notation/packing/part_packing_spec.rb
-- spec/notation/packing/program_packing_spec.rb
 - spec/notation/packing/score_packing_spec.rb
 - spec/notation/parsing/articulation_parsing_spec.rb
 - spec/notation/parsing/convenience_methods_spec.rb

data/lib/musicality/notation/model/program.rb

@@ -1,53 +0,0 @@
-module Musicality
-
-# Program defines markers (by starting note offset) and subprograms (list which markers are played).
-#
-# @author James Tunnell
-#
-class Program
-  include Validatable
-  
-  attr_accessor :segments
-  
-  def initialize segments = []
-    @segments = segments
-  end
-
-  def check_methods
-    [:ensure_increasing_segments, :ensure_nonnegative_segments]
-  end
-  
-  # @return [Float] the sum of all program segment lengths
-  def length
-    segments.inject(0.0) { |length, segment| length + (segment.last - segment.first) }
-  end
-  
-  def == other
-    return other.respond_to?(:segments) && @segments == other.segments
-  end
-
-  def include? offset
-    @segments.each do |segment|
-      if segment.include?(offset)
-        return true
-      end
-    end
-    return false
-  end
-  
-  def ensure_increasing_segments
-    non_increasing = @segments.select {|seg| seg.first >= seg.last }
-    if non_increasing.any?
-      raise NonIncreasingError, "Non-increasing segments found #{non_increasing}"
-    end
-  end
-  
-  def ensure_nonnegative_segments
-    negative = @segments.select {|seg| seg.first < 0 || seg.last < 0 }
-    if negative.any?
-      raise NegativeError, "Segments #{negative} have negative values"
-    end
-  end
-end
-
-end