music-transcription 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6f207886559e2a15ebe43acec8a9249947ccb08
-  data.tar.gz: 2ee121f009ce424d08f77d5ac506b198119f0fdb
+  metadata.gz: df3cae40779381ec3e2bfbe1a6829883529a41a5
+  data.tar.gz: 85c4b61b76208b878bfd5db7d8ebf36c34fac625
 SHA512:
-  metadata.gz: a27f3c9b90864626b185fbece7ffe7db5fb57a734498e2289e1c5e90acba9208302ed9d357f5c0a35178962b0a12eb1b5bb095f04ae86c44aed936b8f0f4b162
-  data.tar.gz: f789efa1958c83eb509a43f12c1cd8d37f4cb31822c2953e7e5ed819321776ed014129c46dc271192c91b3b24751d8df9d190dc7430761d0d8463369de60fb2b
+  metadata.gz: 41d2495c49a7d2cf9dccc7ee4d668bd8e7e349b29a045fbe732bc960f8ca4ea821c4fdf784daa1b0fd175196a661fe9b3480d17138285ef134c0414441e4490e
+  data.tar.gz: 94147ffd63eb13fd3585ae7626f2e5db696cef35e0c72b7a16121608cfe0d4a59a1feea4cdb4a277ff53c7b486b49bf6e734b4e8d8f0605909c488857111a4ca

data/lib/music-transcription/part.rb

@@ -19,6 +19,15 @@ class Part
   def initialize notes: [], dynamic_profile: Profile.new(Dynamics::MF)
     @notes = notes
     @dynamic_profile = dynamic_profile
+    
+    if dynamic_profile.changes_before?(0)
+      raise ArgumentError, "dynamic profile has changes with offset less than 0"
+    end
+    
+    d = self.duration
+    if dynamic_profile.changes_after?(d)
+      raise ArgumentError, "dynamic profile has changes with offset greater than part duration #{d}"
+    end
   end
   
   # Produce an exact copy of the current object
@@ -47,7 +56,26 @@ class Part
     end
     @notes[-1].transpose_pitches_only! pitch_diff
     return self
-  end  
+  end
+  
+  # Add on notes and dynamic_profile from another part, producing a new
+  # 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
+    self.clone.append! other
+  end
+  
+  # Add on notes and dynamic_profile from another part, producing a new
+  # 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)
+    
+    @notes += other.notes.map {|x| x.clone}
+    return self
+  end
 end
 
 end

data/lib/music-transcription/profile.rb

@@ -21,7 +21,44 @@ class Profile
   
   # Produce an identical Profile object.
   def clone
-    Profile.new(@start_value, @value_changes.clone)
+    Marshal.load(Marshal.dump(self))
+  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
+    end
+    return last
+  end
+  
+  def changes_before? offset
+    @value_changes.count {|k,v| k < offset } > 0
+  end
+
+  def changes_after? offset
+    @value_changes.count {|k,v| k > offset } > 0
+  end
+
+  # move changes forward or back by some offset
+  def shift amt
+    self.clone.shift! amt
+  end
+  
+  # move changes forward or back by some offset
+  def shift! amt
+    @value_changes = Hash[@value_changes.map {|k,v| [k+amt,v]}]
+    return self
+  end
+  
+  def merge_changes changes
+    self.clone.merge_changes! changes
+  end
+
+  def merge_changes! changes
+    @value_changes.merge! changes
+    return self
   end
   
   # Returns true if start value and value changes all are between given A and B.

data/lib/music-transcription/version.rb

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

data/spec/part_spec.rb

@@ -8,7 +8,7 @@ describe Part do
 
     it "should assign dynamic profile given during construction" do
       profile = Profile.new(Dynamics::FFF, { 1.0 => Change::Immediate.new(Dynamics::PP) })
-      part = Part.new dynamic_profile: profile
+      part = Part.new notes:[Note.new(1.to_r)], dynamic_profile: profile
       part.dynamic_profile.should eq(profile)
     end  
     
@@ -17,5 +17,42 @@ describe Part do
       part = Part.new notes: notes
       part.notes.should eq(notes)
     end
-  end  
+  end
+  
+  context '#append!' do
+    it 'should add other notes to current array' do
+      p1 = Part.new(notes: [Note::Eighth.new([C4])])
+      p2 = Part.new(notes: [Note::Eighth.new([E4])])
+      p1.append! p2
+      p1.notes.size.should be 2
+      p1.notes[0].pitches[0].should eq C4
+      p1.notes[1].pitches[0].should eq E4
+    end
+    
+    it 'should add start dynamic from given part as immediate dynamic change' do
+      p1 = Part.new(notes: [Note::Eighth.new])
+      p2 = Part.new(notes: [Note::Eighth.new], dynamic_profile: Profile.new(Dynamics::PPP))
+      p1.append! p2
+      p1.dynamic_profile.value_changes.size.should eq 1
+      p1.dynamic_profile.value_changes[Rational(1,8)].should be_a Change::Immediate
+      p1.dynamic_profile.value_changes[Rational(1,8)].value.should eq Dynamics::PPP
+    end
+    
+    it 'should add shifted dynamic changes from given part' do
+      p1 = Part.new(notes: [Note::Whole.new])
+      p2 = Part.new(
+        notes: [Note::Whole.new],
+        dynamic_profile: Profile.new(
+          Dynamics::PPP,
+          Rational(1,8) => Change::Gradual.new(Dynamics::PP),
+          Rational(2,8) => Change::Immediate.new(Dynamics::P)
+        )
+      )
+      p1.append! p2
+      p1.dynamic_profile.value_changes.size.should eq 3
+      p1.dynamic_profile.value_changes[Rational(1,1)].value.should eq Dynamics::PPP
+      p1.dynamic_profile.value_changes[Rational(9,8)].value.should eq Dynamics::PP
+      p1.dynamic_profile.value_changes[Rational(10,8)].value.should eq Dynamics::P
+    end
+  end
 end

data/spec/profile_spec.rb

@@ -17,5 +17,96 @@ describe Profile do
       p.value_changes[1.5].value.should eq(1.0)
     end
   end
+  
+  describe '#last_value' do
+    context 'no value changes' do
+      it 'should return the start value' do
+        p = Profile.new(0.5)
+        p.last_value.should eq 0.5
+      end
+    end
+    
+    context 'with value changes' do
+      it 'should return the value with highest key' do
+        p = Profile.new(0.5, 1.0 => Change::Immediate.new(0.6), 2.0 => Change::Immediate.new(0.7))
+        p.last_value.should eq 0.7
+      end
+    end
+  end
+  
+  describe '#changes_before?' do
+    context 'no value changes' do
+      it 'should return false' do
+        p = Profile.new(0.0)
+        p.changes_before?(0).should be false
+        p.changes_before?(-10000000000000).should be false
+        p.changes_before?(10000000000000).should be false
+      end
+    end
+    
+    context 'with value changes' do
+      context 'with changes before given offset' do
+        it 'should return true' do
+          p = Profile.new(0.0, 5.0 => Change::Immediate.new(0.1), 7.5 => Change::Immediate.new(0.2))
+          p.changes_before?(10.0).should be true
+        end
+      end
+
+      context 'with no changes before given offset' do
+        it 'should return false' do
+          p = Profile.new(0.0, 5.0 => Change::Immediate.new(0.1), 7.5 => Change::Immediate.new(0.2))
+          p.changes_before?(5.0).should be false
+        end      
+      end
+    end
+  end
 
+  describe '#changes_after?' do
+    context 'no value changes' do
+      it 'should return false' do
+        p = Profile.new(0.0)
+        p.changes_after?(0).should be false
+        p.changes_after?(-10000000000000).should be false
+        p.changes_after?(10000000000000).should be false
+      end
+    end
+    
+    context 'with value changes' do
+      context 'with changes after given offset' do
+        it 'should return true' do
+          p = Profile.new(0.0, 5.0 => Change::Immediate.new(0.1), 7.5 => Change::Immediate.new(0.2))
+          p.changes_after?(0.0).should be true
+        end
+      end
+
+      context 'with no changes after given offset' do
+        it 'should return false' do
+          p = Profile.new(0.0, 5.0 => Change::Immediate.new(0.1), 7.5 => Change::Immediate.new(0.2))
+          p.changes_after?(7.5).should be false
+        end
+      end
+    end
+  end
+  
+  describe '#shift!' do
+    it 'should add shift amount to all change offsets' do
+      p = Profile.new(0.0, 5.0 => Change::Immediate.new(0.1), 7.5 => Change::Immediate.new(0.2))
+      p.shift!(1.0)
+      p.value_changes[6.0].value.should eq(0.1)
+      p.value_changes[8.5].value.should eq(0.2)
+      p.shift!(-1.0)
+      p.value_changes[5.0].value.should eq(0.1)
+      p.value_changes[7.5].value.should eq(0.2)
+    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)
+    end
+  end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: music-transcription
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2014-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rubygems-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !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: pry-nav
   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'
 description: "The goal of music-transcription is the abstract representation of standard
@@ -117,11 +117,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
-- ".yardopts"
+- .document
+- .gitignore
+- .rspec
+- .ruby-version
+- .yardopts
 - ChangeLog.rdoc
 - Gemfile
 - LICENSE.txt
@@ -182,12 +182,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []