music-transcription 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df3cae40779381ec3e2bfbe1a6829883529a41a5
-  data.tar.gz: 85c4b61b76208b878bfd5db7d8ebf36c34fac625
+  metadata.gz: 4282478fab3c5ee51b228e44a971e1ac1e16e805
+  data.tar.gz: 07d760fd03b454c6086fba4ee8ef21fe4aec2fd2
 SHA512:
-  metadata.gz: 41d2495c49a7d2cf9dccc7ee4d668bd8e7e349b29a045fbe732bc960f8ca4ea821c4fdf784daa1b0fd175196a661fe9b3480d17138285ef134c0414441e4490e
-  data.tar.gz: 94147ffd63eb13fd3585ae7626f2e5db696cef35e0c72b7a16121608cfe0d4a59a1feea4cdb4a277ff53c7b486b49bf6e734b4e8d8f0605909c488857111a4ca
+  metadata.gz: 5d87e2df814b0aa13654b988a1238d430ada083dcd260cf88ab2dbe4c7c828e9900ec2ed303cd8b15e07f93b23ecef9fe33bfb2b43eba0a2be1835d16f9ef778
+  data.tar.gz: b6715c68ecc2519ee2856bdf8bff13ec55e188abd047ed6a8936e6b2e7543e3b9a97bb8cfba79b62261ec8f6345b2def01c331b9cdecd7982701f69a72a34b92

data/lib/music-transcription/note.rb

@@ -149,7 +149,7 @@ class Note
     end
   end
 
-  class Half < Note
+  class DottedHalf < Note
     def initialize pitches = [], links: {}, accent: nil
       super(Rational(3,4),pitches, links: links, accent: accent)
     end

data/lib/music-transcription/part.rb

@@ -69,10 +69,7 @@ class Part
   # Part object. The offsets of value changes in the dynamic profile,
   # for the other part, will be considered relative from end of current part.
   def append! other
-    d = self.duration
-    @dynamic_profile.merge_changes!(d => Change::Immediate.new(other.dynamic_profile.start_value))
-    @dynamic_profile.merge_changes!(other.dynamic_profile.shift(d).value_changes)
-    
+    @dynamic_profile.append!(other.dynamic_profile,self.duration)
     @notes += other.notes.map {|x| x.clone}
     return self
   end

data/lib/music-transcription/profile.rb

@@ -25,12 +25,11 @@ class Profile
   end
   
   def last_value
-    last = @start_value
-    last_change_pair = @value_changes.max_by {|k,v| k}
-    unless last_change_pair.nil?
-      last = last_change_pair[1].value
+    if @value_changes.empty?
+      return @start_value
+    else
+      return @value_changes[@value_changes.keys.max].value
     end
-    return last
   end
   
   def changes_before? offset
@@ -52,12 +51,28 @@ class Profile
     return self
   end
   
-  def merge_changes changes
-    self.clone.merge_changes! changes
+  def append profile, offset
+    self.clone.append! profile
   end
 
-  def merge_changes! changes
-    @value_changes.merge! changes
+  def append! profile, start_offset
+    if @value_changes.any? && start_offset < @value_changes.keys.max
+      raise ArgumentError, "appending profile overlaps"
+    end
+    
+    lv = self.last_value
+    unless lv == profile.start_value
+      @value_changes[start_offset] = Change::Immediate.new(profile.start_value)
+      lv = profile.start_value
+    end
+    
+    shifted = profile.shift(start_offset)
+    shifted.value_changes.sort.each do |offset,value_change|
+      unless value_change.value == lv
+	@value_changes[offset] = value_change
+	lv = value_change.value
+      end
+    end
     return self
   end
   

data/lib/music-transcription/version.rb

@@ -2,6 +2,6 @@
 module Music
 module Transcription
   # music-transcription version
-  VERSION = "0.5.3"
+  VERSION = "0.5.5"
 end
 end

data/spec/profile_spec.rb

@@ -100,13 +100,49 @@ describe Profile do
     end
   end
   
-  describe '#merge_changes!' do
-    it 'should merge given value changes with existing' do
-      p = Profile.new(0.0, 5.0 => Change::Immediate.new(0.1), 7.5 => Change::Immediate.new(0.2))
-      p.value_changes[7.5].value.should eq(0.2)
-      p.value_changes[10.0].should be nil
-      p.merge_changes!(10.0 => Change::Immediate.new(0.3))
-      p.value_changes[10.0].value.should eq(0.3)
+  describe '#append!' do
+    before :each do
+      @p1 = Profile.new(0.0, 5.0 => Change::Immediate.new(0.1), 7.5 => Change::Immediate.new(0.2))
+      @p2 = Profile.new(0.2, 1.0 => Change::Immediate.new(0.0), 2.0 => Change::Gradual.new(100.0))
+      @p3 = Profile.new(0.1, 1.0 => Change::Immediate.new(0.0))
+    end
+    
+    context 'offset less than last value change offset' do
+      it' should raise ArgumentError' do
+        expect { @p1.append!(@p2,7.0) }.to raise_error(ArgumentError)
+      end
+    end
+    
+    context 'offset equal to last value change offset' do
+      it' should not raise ArgumentError' do
+        expect { @p1.append!(@p2,7.5) }.not_to raise_error
+      end
+    end
+    
+    context 'offset greater than last value change offset' do
+      it' should not raise ArgumentError' do
+        expect { @p1.append!(@p2, 7.6) }.not_to raise_error
+      end
+      
+      it 'should add on shifted value changes from second profile' do
+        @p1.append!(@p2,10.0)
+        @p1.value_changes[11.0].value.should eq 0.0
+        @p1.value_changes[12.0].value.should eq 100.0
+      end
+    end
+    
+    context 'second profile start value equal to first profile last value' do
+      it 'should not add value change at offset' do
+        @p1.append!(@p2, 10.0)
+        @p1.value_changes[10.0].should be nil
+      end
+    end
+
+    context 'second profile start value not equal to first profile last value' do
+      it 'should add value change at offset' do
+        @p1.append!(@p3, 10.0)
+        @p1.value_changes[10.0].should_not be nil
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: music-transcription
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - James Tunnell