music-transcription 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2519d2fe69e6b6d5944695bae502dece8dd456c9
-  data.tar.gz: b4da4b389692c5eb70bb2505d003a783fd565833
+  metadata.gz: 2b53782c68a60ec01fd23022b00fa7ee67a76c6c
+  data.tar.gz: 22433554e9566a3841800f4ab757268160e2b5f1
 SHA512:
-  metadata.gz: 80a849288ffc1c279b5083ea6d878bb7de606d9f69b6885263945a5b95e1617a5c33cea586639fa8560c6ef72c4669892c2a4c913a0a0234d2b38d46693d36dd
-  data.tar.gz: a4ca68fad70b5cee5939fa319e23a0fc3580ed0b3016e03b2046ea3e56f1f84d5610c9857f31ac29f409c8b673f4b6b4d3b762f02366dd02132bd72543a1c995
+  metadata.gz: b6fc8591be37735700427c607dac2cc71706287eb704e9179a4077c99a92d6a7f03c70ee3c9ded54115f5f0a54ad444640bc8cb85c206be849a0e32261fdc34c
+  data.tar.gz: 5c9bc76ed55f0f729fbf0caf384c7aaad4aa0e3f9f72961995d1bb3cf2f78604b0f3ffcc268bacb2f7eae055a63e9736f265e1377f0cbc8ece39bab2af20616a

data/lib/music-transcription/model/link.rb

@@ -18,8 +18,12 @@ class Link
       self.class == other.class
     end
     
+    def transpose diff
+      self.clone.transpose! diff
+    end
+    
     def transpose! diff
-      # do nothing, of course
+      return self
     end
     
     def to_s; "="; end
@@ -37,8 +41,12 @@ class Link
       self.class == other.class && @target_pitch == other.target_pitch
     end
     
+    def transpose diff
+      self.clone.transpose! diff
+    end
+    
     def transpose! diff
-      @target_pitch += diff
+      @target_pitch = @target_pitch.transpose(diff)
     end
     
     def to_s

data/lib/music-transcription/model/note.rb

@@ -43,17 +43,10 @@ class Note
   end
   
   def transpose! diff
-    unless diff.is_a?(Pitch)
-      diff = Pitch.from_semitones(diff)
-    end
-    
-    @pitches = @pitches.map {|pitch| pitch + diff}
-    new_links = {}
-    @links.each_pair do |k,v|
-      v.transpose! diff
-      new_links[k + diff] = v
-    end
-    @links = new_links
+    @pitches = @pitches.map {|pitch| pitch.transpose(diff) }
+    @links = Hash[ @links.map do |k,v|
+      [ k.transpose(diff), v.transpose(diff) ]
+    end ]
     return self
   end
   

data/lib/music-transcription/model/pitch.rb

@@ -20,7 +20,7 @@ module Transcription
 #
 class Pitch
   include Comparable
-  attr_reader :octave, :semitone
+  attr_reader :octave, :semitone, :total_semitone
 
   #The default number of semitones per octave is 12, corresponding to 
   # the twelve-tone equal temperment tuning system.
@@ -33,6 +33,7 @@ class Pitch
     @octave = octave
     @semitone = semitone
     normalize!
+    @total_semitone = @octave*SEMITONES_PER_OCTAVE + @semitone
   end
 
   # Return the pitch's frequency, which is determined by multiplying the base 
@@ -43,40 +44,22 @@ class Pitch
     return self.ratio() * BASE_FREQ
   end
   
-  # Calculate the total semitone count. Converts octave to semitone count
-  # before adding to existing semitone count.
-  # @return [Fixnum] total semitone count
-  def total_semitone
-    return (@octave * SEMITONES_PER_OCTAVE) + @semitone
-  end
-  
   # Calculate the pitch ratio. Raises 2 to the power of the total semitone
   # count divided by semitones-per-octave.
   # @return [Float] ratio
   def ratio
-    2.0**(self.total_semitone.to_f / SEMITONES_PER_OCTAVE)
-  end
-
-  # Round to the nearest semitone.
-  def round
-    self.clone.round!
-  end
-
-  # Calculates the number of semitones which would represent the pitch's
-  # octave and semitone count
-  def total_semitone
-    return (@octave * SEMITONES_PER_OCTAVE) + @semitone
+    2.0**(@total_semitone.to_f / SEMITONES_PER_OCTAVE)
   end
   
   # Override default hash method.
   def hash
-    return self.total_semitone
+    return @total_semitone
   end
   
   # Compare pitch equality using total semitone
   def ==(other)
     return (self.class == other.class &&
-      self.total_semitone == other.total_semitone)
+      @total_semitone == other.total_semitone)
   end
   
   def eql?(other)
@@ -86,29 +69,15 @@ class Pitch
   # Compare pitches. A higher ratio or total semitone is considered larger.
   # @param [Pitch] other The pitch object to compare.
   def <=> (other)
-    self.total_semitone <=> other.total_semitone
+    @total_semitone <=> other.total_semitone
   end
-
-  # Add pitches by adding the total semitone count of each.
-  # @param [Pitch] other The pitch object to add. 
-  def + (other)
-    if other.is_a? Integer
-      return Pitch.new(octave: @octave, semitone: @semitone + other)
-    else
-      return Pitch.new(octave: (@octave + other.octave),
-        semitone: (@semitone + other.semitone))
-    end
+  
+  def diff other
+    @total_semitone - other.total_semitone
   end
-
-  # Add pitches by subtracting the total semitone count.
-  # @param [Pitch] other The pitch object to subtract.
-  def - (other)
-    if other.is_a? Integer
-      return Pitch.new(octave: @octave, semitone: @semitone - other)
-    else
-      return Pitch.new(octave: (@octave - other.octave),
-        semitone: (@semitone - other.semitone))
-    end
+  
+  def transpose interval
+    Pitch.from_semitones @total_semitone + interval
   end
   
   # Produce an identical Pitch object.

data/lib/music-transcription/version.rb

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

data/spec/model/note_spec.rb

@@ -64,61 +64,44 @@ describe Note do
     end
   end
   
-  describe '#transpose!' do
+  describe '#transpose' do
     context 'given pitch diff' do
       before(:all) do
-        @note = Note::quarter([C2,F2], links:{C2=>Link::Glissando.new(D2)})
-        @diff = Pitch.new(semitone: 4)
-        @note.transpose! @diff
+        @note1 = Note::quarter([C2,F2], links:{C2=>Link::Glissando.new(D2)})
+        @interval = 4
+        @note2 = @note1.transpose(@interval)
       end
         
       it 'should modifiy pitches by adding pitch diff' do
-        @note.pitches[0].should eq E2
-        @note.pitches[1].should eq A2
+        @note2.pitches.each_with_index do |p,i|
+          p.diff(@note1.pitches[i]).should eq(@interval)
+        end
       end
         
       it 'should also affect link targets' do
-        @note.links.should have_key(E2)
-        @note.links[E2].target_pitch.should eq(Gb2)
-      end
-    end
-    
-    context 'given integer diff' do
-      it 'should transpose the given number of semitones' do
-        Note::quarter([C2]).transpose!(4).pitches[0].should eq(E2)
+        @note1.links.each do |k,v|
+          kt = k.transpose(@interval)
+          @note2.links.should have_key kt
+          @note2.links[kt].target_pitch.should eq(v.target_pitch.transpose(@interval))
+        end
       end
     end
     
     context 'with links that have no target pitch' do
       it 'should not raise error' do
         n = Note::half([E2],links: {E2 => Link::Tie.new})
-        expect { n.transpose!(1) }.to_not raise_error
+        expect { n.transpose(1) }.to_not raise_error
       end
     end
-    
-    it 'should return self' do
-      n = Note::quarter
-      n.transpose!(0).should eq n
-    end
   end
   
-  describe '#stretch!' do
+  describe '#stretch' do
     it 'should multiply note duration by ratio' do
-      note = Note::quarter
-      note.stretch!(2)
+      note = Note::quarter.stretch(2)
       note.duration.should eq(Rational(1,2))
       
-      note = Note::quarter
-      note.stretch!(Rational(1,2))
+      note = Note::quarter.stretch(Rational(1,2))
       note.duration.should eq(Rational(1,8))
-      note = Note::quarter
-      note.stretch!(2)
-      note.duration.should eq(Rational(1,2))
-    end
-    
-    it 'should return self' do
-      note = Note::quarter
-      note.stretch!(1).should be note
     end
   end
   

data/spec/model/pitch_spec.rb

@@ -40,6 +40,23 @@ describe Pitch do
       p.total_semitone.should be case_data[:total_semitone]
     end
   end
+  
+  describe '#diff' do
+    it 'should return the difference between the given pitch, in semitones' do
+      C5.diff(C4).should eq(12)
+      C5.diff(D5).should eq(-2)
+      D5.diff(C5).should eq(2)
+    end
+  end
+  
+  describe '#transpose' do
+    it 'should add the given interval to total semitones' do
+      [0,1,2,5,12,13,-1,-2,-5,-12,-13].each do |interval|
+        pitch = Eb3.transpose(interval)
+        pitch.diff(Eb3).should eq(interval)
+      end
+    end
+  end
 
   describe '.from_ratio' do
     it 'should return a Pitch with given ratio' do
@@ -90,38 +107,6 @@ describe Pitch do
     p3.should be > p1
     p2.should be > p1
   end
-
-  it "should be addable and subtractable with other pitches" do
-    p1 = Pitch.new semitone: 1
-    p2 = Pitch.new semitone: 2
-    p3 = Pitch.new semitone: 3
-    
-    (p1 + p2).should eq(Pitch.new semitone: 3) 
-    (p1 + p3).should eq(Pitch.new semitone: 4)
-    (p2 + p3).should eq(Pitch.new semitone: 5)
-    
-    (p1 - p2).should eq(Pitch.new semitone: -1) 
-    (p1 - p3).should eq(Pitch.new semitone: -2)
-    (p2 - p3).should eq(Pitch.new semitone: -1)
-    (p3 - p2).should eq(Pitch.new semitone: 1)
-    (p3 - p1).should eq(Pitch.new semitone: 2)
-  end
-  
-  it "should be addable and subtractable with integers" do
-    p1 = Pitch.new semitone: 1
-    p2 = Pitch.new semitone: 2
-    p3 = Pitch.new semitone: 3
-    
-    (p1 + 2).should eq(Pitch.new semitone: 3) 
-    (p1 + 3).should eq(Pitch.new semitone: 4)
-    (p2 + 3).should eq(Pitch.new semitone: 5)
-    
-    (p1 - 2).should eq(Pitch.new semitone: -1) 
-    (p1 - 3).should eq(Pitch.new semitone: -2)
-    (p2 - 3).should eq(Pitch.new semitone: -1)
-    (p3 - 2).should eq(Pitch.new semitone: 1)
-    (p3 - 1).should eq(Pitch.new semitone: 2)
-  end
   
   it "should have freq of 440 for A4" do
     a4 = Pitch.new octave: 4, semitone: 9

metadata

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