musicality 0.2.0 → 0.3.0

data/spec/performance/conversion/score_collator_spec.rb

@@ -83,6 +83,43 @@ describe ScoreCollator do
       end
     end
     
+    context 'part contains trimmed gradual changes' do
+      it 'should exclude the change when it is not at all in a program segment' do
+        score = Score::Measured.new(FOUR_FOUR, 120,
+          parts: { 1 => Part.new(Dynamics::FF, dynamic_changes: {
+            2 => Change::Gradual.linear(Dynamics::PP,5).trim(1,0)
+          }) },
+          program: Program.new([7...9])
+        )
+        collator = ScoreCollator.new(score)
+        parts = collator.collate_parts
+        dcs = parts[1].dynamic_changes
+        dcs.size.should eq(1)
+        dcs[0.to_r].should eq(Change::Immediate.new(Dynamics::PP))
+        
+        score.program = Program.new([0...1])
+        collator = ScoreCollator.new(score)
+        parts = collator.collate_parts
+        dcs = parts[1].dynamic_changes
+        dcs.size.should eq(1)
+        dcs[0.to_r].should eq(Change::Immediate.new(Dynamics::FF))
+      end
+      
+      it 'should trim the change further if needed' do
+        score = Score::Measured.new(FOUR_FOUR, 120,
+          parts: { 1 => Part.new(Dynamics::FF, dynamic_changes: {
+            2 => Change::Gradual.linear(Dynamics::PP,5).trim(1,1)
+          }) },
+          program: Program.new([3...4])
+        )
+        collator = ScoreCollator.new(score)
+        parts = collator.collate_parts
+        dcs = parts[1].dynamic_changes
+        dcs.size.should eq(1)
+        dcs[0.to_r].should eq(Change::Gradual.linear(Dynamics::PP,5).trim(2,2))
+      end
+    end
+    
     it 'should preserve links' do
       notes = Note.split_parse("1Db4~Bb4")
       score = Score::Measured.new(
@@ -106,7 +143,7 @@ describe ScoreCollator do
     before :all do
       @change0 = Change::Immediate.new(120)
       @change1 = Change::Immediate.new(200)
-      @change2 = Change::Gradual.new(100,1)
+      @change2 = Change::Gradual.linear(100,1)
     end
     
     context 'tempo change starts at end of program segment' do
@@ -134,8 +171,8 @@ describe ScoreCollator do
         @tcs[0.to_r].should be_a Change::Immediate
       end
       
-      it 'should be used as starting tempo change value' do
-        @tcs[0.to_r].value.should eq @change2.value
+      it 'should be used as starting tempo change end_value' do
+        @tcs[0.to_r].end_value.should eq @change2.end_value
       end
     end
     
@@ -146,8 +183,9 @@ describe ScoreCollator do
         collator = ScoreCollator.new(score)
         tcs = collator.collate_tempo_changes
         tcs.size.should eq 1
-        tcs[0.to_r].value.should eq @change2.value
-        tcs[0.to_r].duration.should eq(0.5)
+        tcs[0.to_r].should be_a Change::Gradual::Trimmed
+        tcs[0.to_r].end_value.should eq @change2.end_value
+        tcs[0.to_r].remaining.should eq(0.5)
       end
     end
     
@@ -160,8 +198,9 @@ describe ScoreCollator do
         tcs.size.should eq 3
         tcs[0.to_r].should eq @change0
         tcs[1.to_r].should eq @change1
-        tcs[2.to_r].value.should eq @change2.value
-        tcs[2.to_r].duration.should eq(0.5)
+        tcs[2.to_r].should be_a Change::Gradual::Trimmed
+        tcs[2.to_r].end_value.should eq @change2.end_value
+        tcs[2.to_r].remaining.should eq(0.5)
       end
     end
   end

data/spec/performance/midi/part_sequencer_spec.rb

@@ -3,7 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 describe PartSequencer do
   describe '#make_midi_track' do
     before :all do
-      part = Part.new(Dynamics::PP, notes: "/4C4 /4D4 /8 /8D4 /8E4 /2C4".to_notes * 2)
+      part = Part.new(Dynamics::PP, notes: "/4C4 /4D4 /8 /8D4 /8E4 /2C4".to_notes * 2,
+                      dynamic_changes: { 1 => Change::Gradual.linear(Dynamics::FF,2) })
       @midi_seq = MIDI::Sequence.new
       @part_name = "mypart"
       @channel = 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musicality
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +123,7 @@ files:
 - .gitignore
 - .rspec
 - .ruby-version
+- ChangeLog.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -122,12 +137,10 @@ files:
 - lib/musicality/errors.rb
 - lib/musicality/notation/conversion/change_conversion.rb
 - lib/musicality/notation/conversion/measure_note_map.rb
-- lib/musicality/notation/conversion/measured_score_conversion.rb
-- lib/musicality/notation/conversion/measured_score_converter.rb
 - lib/musicality/notation/conversion/note_time_converter.rb
+- lib/musicality/notation/conversion/score_conversion.rb
+- lib/musicality/notation/conversion/score_converter.rb
 - lib/musicality/notation/conversion/tempo_conversion.rb
-- lib/musicality/notation/conversion/unmeasured_score_conversion.rb
-- lib/musicality/notation/conversion/unmeasured_score_converter.rb
 - lib/musicality/notation/model/articulations.rb
 - lib/musicality/notation/model/change.rb
 - lib/musicality/notation/model/dynamics.rb
@@ -176,8 +189,10 @@ files:
 - lib/musicality/notation/parsing/pitch_parsing.treetop
 - lib/musicality/notation/parsing/segment_parsing.rb
 - lib/musicality/notation/parsing/segment_parsing.treetop
+- lib/musicality/notation/util/function.rb
 - lib/musicality/notation/util/interpolation.rb
 - lib/musicality/notation/util/piecewise_function.rb
+- lib/musicality/notation/util/transition.rb
 - lib/musicality/notation/util/value_computer.rb
 - lib/musicality/performance/conversion/glissando_converter.rb
 - lib/musicality/performance/conversion/note_sequence_extractor.rb
@@ -197,12 +212,10 @@ files:
 - spec/musicality_spec.rb
 - spec/notation/conversion/change_conversion_spec.rb
 - spec/notation/conversion/measure_note_map_spec.rb
-- spec/notation/conversion/measured_score_conversion_spec.rb
-- spec/notation/conversion/measured_score_converter_spec.rb
 - spec/notation/conversion/note_time_converter_spec.rb
+- spec/notation/conversion/score_conversion_spec.rb
+- spec/notation/conversion/score_converter_spec.rb
 - spec/notation/conversion/tempo_conversion_spec.rb
-- spec/notation/conversion/unmeasured_score_conversion_spec.rb
-- spec/notation/conversion/unmeasured_score_converter_spec.rb
 - spec/notation/model/change_spec.rb
 - spec/notation/model/link_spec.rb
 - spec/notation/model/meter_spec.rb
@@ -233,6 +246,8 @@ files:
 - spec/notation/parsing/pitch_node_spec.rb
 - spec/notation/parsing/pitch_parsing_spec.rb
 - spec/notation/parsing/segment_parsing_spec.rb
+- spec/notation/util/function_spec.rb
+- spec/notation/util/transition_spec.rb
 - spec/notation/util/value_computer_spec.rb
 - spec/performance/conversion/glissando_converter_spec.rb
 - spec/performance/conversion/note_sequence_extractor_spec.rb
@@ -273,12 +288,10 @@ test_files:
 - spec/musicality_spec.rb
 - spec/notation/conversion/change_conversion_spec.rb
 - spec/notation/conversion/measure_note_map_spec.rb
-- spec/notation/conversion/measured_score_conversion_spec.rb
-- spec/notation/conversion/measured_score_converter_spec.rb
 - spec/notation/conversion/note_time_converter_spec.rb
+- spec/notation/conversion/score_conversion_spec.rb
+- spec/notation/conversion/score_converter_spec.rb
 - spec/notation/conversion/tempo_conversion_spec.rb
-- spec/notation/conversion/unmeasured_score_conversion_spec.rb
-- spec/notation/conversion/unmeasured_score_converter_spec.rb
 - spec/notation/model/change_spec.rb
 - spec/notation/model/link_spec.rb
 - spec/notation/model/meter_spec.rb
@@ -309,6 +322,8 @@ test_files:
 - spec/notation/parsing/pitch_node_spec.rb
 - spec/notation/parsing/pitch_parsing_spec.rb
 - spec/notation/parsing/segment_parsing_spec.rb
+- spec/notation/util/function_spec.rb
+- spec/notation/util/transition_spec.rb
 - spec/notation/util/value_computer_spec.rb
 - spec/performance/conversion/glissando_converter_spec.rb
 - spec/performance/conversion/note_sequence_extractor_spec.rb

data/lib/musicality/notation/conversion/measured_score_conversion.rb

@@ -1,70 +0,0 @@
-module Musicality
-
-class Score
-  class Measured < TempoBased
-    # Convert to unmeasured score by converting measure-based offsets to
-    # note-based offsets, and eliminating the use of meters. Also, tempo is
-    # coverted from beats-per-minute to quarter-notes per minute.
-    def to_unmeasured
-      MeasuredScoreConverter.new(self).convert_score
-    end
-
-    def to_timed tempo_sample_rate
-      unmeasured = MeasuredScoreConverter.new(self).convert_score
-      unmeasured.to_timed(tempo_sample_rate)
-    end
-    
-    def measure_note_map
-      Conversion::measure_note_map(measure_offsets,measure_durations)
-    end
-    
-    def measure_offsets
-      moffs = Set.new([0.to_r])
-      
-      @tempo_changes.each do |moff,change|
-        moffs += change.offsets(moff)
-      end
-      
-      @meter_changes.keys.each {|moff| moffs.add(moff) }
-      
-      @parts.values.each do |part|
-        part.dynamic_changes.each do |moff,change|
-          moffs += change.offsets(moff)
-        end
-      end
-      
-      @program.segments.each do |seg|
-        moffs.add(seg.first)
-        moffs.add(seg.last)
-      end
-      
-      return moffs.sort
-    end
-  
-    def beat_durations
-      bdurs = @meter_changes.map do |offset,change|
-        [ offset, change.value.beat_duration ]
-      end.sort
-      
-      if bdurs.empty? || bdurs[0][0] != 0
-        bdurs.unshift([0,@start_meter.beat_duration])
-      end
-    
-      return bdurs
-    end
-    
-    def measure_durations
-      mdurs = @meter_changes.map do |offset,change|
-        [ offset, change.value.measure_duration ]
-      end.sort
-      
-      if mdurs.empty? || mdurs[0][0] != 0
-        mdurs.unshift([0,@start_meter.measure_duration])
-      end
-    
-      return Hash[ mdurs ]
-    end  
-  end
-end
-
-end

data/lib/musicality/notation/conversion/measured_score_converter.rb

@@ -1,95 +0,0 @@
-module Musicality
-
-# Converts measured score to unmeasured by converting measure-based offsets
-# and durations to note-based offsets, and eliminating the use of meters.
-# Also, tempo is coverted from beats-per-minute to quarter-notes per minute.
-class MeasuredScoreConverter
-  def initialize score
-    unless score.valid?
-      raise NotValidError, "The given score can not be converted because \
-                            it is invalid, with these errors: #{score.errors}"
-    end
-    
-    @score = score
-    @mnoff_map = score.measure_note_map
-  end
-  
-  def convert_score
-    Score::Unmeasured.new(convert_start_tempo,
-      parts: convert_parts, program: convert_program,
-      tempo_changes: convert_tempo_changes)
-  end
-  
-  def convert_parts
-    Hash[ @score.parts.map do |name,part|
-      new_dcs = Hash[ part.dynamic_changes.map do |moff,change|
-        case change
-        when Change::Immediate
-          [@mnoff_map[moff],change.clone]
-        when Change::Gradual
-          noff1, noff2, noff3, noff4 = change.offsets(moff).map {|x| @mnoff_map[x] }
-          [noff2, Change::Gradual.new(change.value,
-            noff3-noff2, noff2-noff1, noff4-noff3)]
-        end
-      end ]
-      new_notes = part.notes.map {|n| n.clone }
-      [name, Part.new(part.start_dynamic,
-        notes: new_notes, dynamic_changes: new_dcs)]
-    end ]
-  end
-  
-  def convert_program
-    Program.new(
-      @score.program.segments.map do |seg|
-        @mnoff_map[seg.first]...@mnoff_map[seg.last]
-      end
-    )
-  end
-  
-  def convert_start_tempo
-    Tempo::BPM.to_qnpm(@score.start_tempo, @score.start_meter.beat_duration)
-  end
-  
-  def convert_tempo_changes
-    tcs = {}
-    bdurs = @score.beat_durations
-    
-    @score.tempo_changes.each do |moff,change|
-      bdur = bdurs.select {|x,y| x <= moff}.max[1]
-      tempo = change.value
-      
-      case change
-      when Change::Immediate
-        tcs[@mnoff_map[moff]] = Change::Immediate.new(Tempo::BPM.to_qnpm(tempo,bdur))
-      when Change::Gradual
-        start_moff, end_moff = moff, moff + change.duration
-        start_noff, end_noff = @mnoff_map[start_moff], @mnoff_map[end_moff]
-        
-        initial_moff, final_moff = start_moff - change.elapsed, end_moff + change.remaining
-        initial_noff, final_noff = @mnoff_map[initial_moff], @mnoff_map[final_moff]
-        
-        more_bdurs = bdurs.select {|x,y| x > start_moff && x < end_moff }
-        cur_noff, cur_bdur = start_noff, bdur
-        
-        more_bdurs.each do |next_moff, next_bdur|
-          next_noff = @mnoff_map[next_moff]
-          elapsed = cur_noff - initial_noff
-          impending = next_noff - cur_noff
-          remaining = final_noff - next_noff
-          tempo2 = Tempo::BPM.to_qnpm(tempo, cur_bdur)
-          tcs[cur_noff] = Change::Gradual.new(tempo2, impending, elapsed, remaining)
-          cur_noff, cur_bdur = next_noff, next_bdur
-        end
-        elapsed = cur_noff - initial_noff
-        impending = end_noff - cur_noff
-        remaining = final_noff - end_noff
-        tempo2 = Tempo::BPM.to_qnpm(tempo, cur_bdur)
-        tcs[cur_noff] = Change::Gradual.new(tempo2, impending, elapsed, remaining)
-      end
-    end
-    
-    return tcs
-  end
-end
-
-end

data/lib/musicality/notation/conversion/unmeasured_score_conversion.rb

@@ -1,47 +0,0 @@
-module Musicality
-
-class Score
-  class Unmeasured < TempoBased
-    # Convert to unmeasured score by converting measure-based offsets to
-    # note-based offsets, and eliminating the use of meters. Also, tempo is
-    # coverted from beats-per-minute to quarter-notes per minute.
-    def to_timed tempo_sample_rate
-      UnmeasuredScoreConverter.new(self,tempo_sample_rate).convert_score
-    end
-    
-    def note_time_map tempo_sample_rate
-      tempo_computer = ValueComputer.new(@start_tempo, @tempo_changes)
-      ntc = NoteTimeConverter.new(tempo_computer, tempo_sample_rate)
-      ntc.note_time_map(note_offsets)
-    end
-        
-    def note_offsets
-      noffs = Set.new([0.to_r])
-      
-      @tempo_changes.each do |noff,change|
-        noffs += change.offsets(noff)
-      end
-      
-      @parts.values.each do |part|
-        noff = 0.to_r
-        part.notes.each do |note|
-          noff += note.duration
-          noffs.add(noff)
-        end
-        
-        part.dynamic_changes.each do |noff,change|
-          noffs += change.offsets(noff)
-        end
-      end
-      
-      @program.segments.each do |seg|
-        noffs.add(seg.first)
-        noffs.add(seg.last)
-      end
-      
-      return noffs.sort
-    end
-  end
-end
-
-end

data/lib/musicality/notation/conversion/unmeasured_score_converter.rb

@@ -1,64 +0,0 @@
-require 'set'
-
-module Musicality
-
-# Converts unmeasured score to timed score, by converting note-based offsets
-# and durations to time-based, and eliminating the use of tempo.
-class UnmeasuredScoreConverter
-
-  def initialize score, tempo_sample_rate
-    unless score.valid?
-      raise NotValidError, "The given score can not be converted because \
-                            it is invalid, with these errors: #{score.errors}"
-    end
-    
-    @score = score
-    @note_time_map = score.note_time_map(tempo_sample_rate)
-  end
-  
-  def convert_score
-    Score::Timed.new(parts: convert_parts, program: convert_program)
-  end
-  
-  # Convert note-based offsets & durations to time-based.
-  def convert_parts
-    Hash[ @score.parts.map do |name,part|
-      offset = 0.to_r
-      
-      new_notes = part.notes.map do |note|
-        starttime = @note_time_map[offset]
-        endtime = @note_time_map[offset + note.duration]
-        offset += note.duration
-        newnote = note.clone
-        newnote.duration = endtime - starttime
-        newnote
-      end
-      
-      new_dcs = Hash[ part.dynamic_changes.map do |noff,change|
-        case change
-        when Change::Immediate
-          [@note_time_map[noff],change.clone]
-        when Change::Gradual
-          toff1, toff2, toff3, toff4 = change.offsets(noff).map {|x| @note_time_map[x] }
-          [toff2, Change::Gradual.new(change.value,
-            toff3-toff2, toff2-toff1, toff4-toff3)]
-        end
-      end ]
-      
-      [name, Part.new(part.start_dynamic,
-        notes: new_notes, dynamic_changes: new_dcs)]
-    end]
-  end
-  
-  # Convert note-based offsets & durations to time-based.
-  def convert_program
-    newsegments = @score.program.segments.map do |segment|
-      first = @note_time_map[segment.first]
-      last = @note_time_map[segment.last]
-      first...last
-    end
-    Program.new(newsegments)
-  end
-end
-
-end