musicality 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25e0c57192fe59be6b7839c2eb1b7a0ebfca7d5e
-  data.tar.gz: 3e5b8efeddfdcb1a7fa4b1f78a8752204109779e
+  metadata.gz: f9413fe250183b04ea15a863a580cd90887ccb5e
+  data.tar.gz: d2820bd7695d490fb139508d663b202b2d867202
 SHA512:
-  metadata.gz: 41c88ca97959bdb89f55e27a69505a77a3f045c5ef6406d4c9d3fba61969f60ef3a7e9ad3e94d4323217b3bc45d6d972cd06ee070448a6f34c69b3b93b41fd49
-  data.tar.gz: b6019f6508f05bfd4d8cfb82e6bd9b724b3a4b6af0e1dde1f2cf2eb5d625836fcc00a47162f4d2457a74d3cd9b81f14fb2f8ed8438eb96a4435595a9c155c10f
+  metadata.gz: ffb85df1738b9948c0d23c627be1a42b195ce438b9098575ec9d662b1383f9689b7c9bc57cd432498bd9dd87306d4ddb5f8c4ad481502c3d3d1dfa664fe7bfca
+  data.tar.gz: f4e9a0f14009a2a50b3cf377504283cca9e5858bce3335649a80bb99021f386ed6203b62f88ea935541976bddfedb81bf766f5ffb8648ca9e1b1fe67f3236eeb

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

@@ -1,7 +1,7 @@
 module Musicality
 
 module Conversion
-  # Converte offsets from measure-based to note-based.
+  # Convert offsets from measure-based to note-based.
   # @param [Array] measure_offsets Measure offsets to be converted
   # @param [Hash] measure_durations Map measure durations to measure offsets where the duration takes effect.
   # @raise [NonZeroError] if first measure duration is not mapped to offset 0

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

@@ -23,7 +23,7 @@ class Score
   end
   
   def duration
-    @parts.map {|p| p.duration }.max
+    @parts.map {|name,part| part.duration }.max || 0.to_r
   end
   
   def collated?
@@ -31,6 +31,9 @@ class Score
   end
   
   class Timed < Score
+    def seconds_long
+      self.duration
+    end
   end
   
   class TempoBased < Score
@@ -53,6 +56,10 @@ class Score
       @tempo_changes == other.tempo_changes
     end
     
+    def notes_long
+      self.duration
+    end
+    
     def check_start_tempo
       if @start_tempo <= 0
         raise NonPositiveError, "start tempo (#{@start_tempo}) is not positive"
@@ -126,6 +133,27 @@ class Score
       return super(other) && @start_meter == other.start_meter &&
         @meter_changes == other.meter_changes
     end
+    
+    def measures_long
+      noff_end = self.notes_long
+      noff_prev = 0.to_r
+      moff_prev, mdur_prev = 0.to_r, @start_meter.measure_duration
+      
+      @meter_changes.sort.each do |moff,change|
+        mdur = change.value.measure_duration
+        notes_elapsed = mdur_prev * (moff - moff_prev)
+        noff = noff_prev + notes_elapsed
+        
+        if noff >= noff_end
+          break
+        else
+          noff_prev = noff
+        end
+        
+        moff_prev, mdur_prev = moff, mdur
+      end
+      return moff_prev + Rational(noff_end - noff_prev, mdur_prev)
+    end
   end
 end
 

data/lib/musicality/version.rb

@@ -1,3 +1,3 @@
 module Musicality
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/notation/model/score_spec.rb

@@ -32,6 +32,22 @@ describe Score do
       end
     end
   end
+  
+  describe '#duration' do
+    context 'no parts' do
+      it 'should return 0' do
+        Score.new.duration.should eq(0)
+      end
+    end
+    
+    context 'one part' do
+      it 'should return the part duration' do
+        Score.new(parts: {"part1" => Part.new(Dynamics::PP,
+          notes: "/4 /4 /2 1".to_notes)
+        }).duration.should eq(2)
+      end
+    end
+  end
 end
 
 describe Score::Measured do
@@ -66,6 +82,58 @@ describe Score::Measured do
     end
   end
   
+  describe '#measures_long' do
+    context 'with no meter changes' do
+      context 'with no parts' do
+        it 'should return 0' do
+          Score::Measured.new(TWO_FOUR, 120).measures_long.should eq(0)
+        end
+      end
+
+      context 'with one part' do
+        it 'should return the duration of the part, in measures' do
+          Score::Measured.new(TWO_FOUR, 120, parts: {
+            "abc" => Part.new(Dynamics::MF, notes: "/4 /4 /2 3/4".to_notes)
+          }).measures_long.should eq(3.5)
+        end
+      end
+      
+      context 'with two parts' do
+        it 'should return the duration of the longest part, in measures' do
+          Score::Measured.new(TWO_FOUR, 120, parts: {
+            "abc" => Part.new(Dynamics::MF, notes: "/4 /4 /2 3/4".to_notes),
+            "def" => Part.new(Dynamics::MF, notes: "/4 /4 /2 1".to_notes)
+          }).measures_long.should eq(4)
+        end
+      end
+    end
+    
+    context 'with meter changes' do
+      it 'should return the duration of the longest part, in measures' do
+        Score::Measured.new(TWO_FOUR, 120,
+          meter_changes: {
+            2 => Change::Immediate.new(FOUR_FOUR),
+          },
+          parts: {
+            "abc" => Part.new(Dynamics::MF, notes: "/4 /4 /2 3/4".to_notes),
+            "def" => Part.new(Dynamics::MF, notes: "/4 /4 /2 1".to_notes)
+          }
+        ).measures_long.should eq(3)
+        
+        Score::Measured.new(TWO_FOUR, 120,
+          meter_changes: {
+            2 => Change::Immediate.new(FOUR_FOUR),
+            4 => Change::Immediate.new(SIX_EIGHT),
+          },
+          parts: {
+            "abc" => Part.new(Dynamics::MF, notes: "/4 /4 /2 3/4".to_notes),
+            "def" => Part.new(Dynamics::MF, notes: "/4 /4 /2 1 /2".to_notes)
+          }
+        ).measures_long.should eq(3.5)
+      end
+    end
+  end
+
   describe '#valid?' do
     {
       'valid start tempo' => [ FOUR_FOUR, 40 ],
@@ -134,6 +202,15 @@ describe Score::Unmeasured do
       s.tempo_changes.should eq tcs
     end
   end
+
+  describe '#notes_long' do
+    it 'should return the duration of the longest part' do
+      Score::Unmeasured.new(120, parts: {
+        "abc" => Part.new(Dynamics::MF, notes: "/4 /4 /2 3/4".to_notes),
+        "def" => Part.new(Dynamics::MF, notes: "/4 /4 /2 1".to_notes)
+      }).notes_long.should eq(2)
+    end
+  end
   
   describe '#valid?' do
     {
@@ -185,6 +262,15 @@ describe Score::Timed do
     end
   end
   
+  describe '#seconds_long' do
+    it 'should return the duration of the longest part' do
+      Score::Timed.new(parts: {
+        "abc" => Part.new(Dynamics::MF, notes: "/4 /4 /2 3/4".to_notes),
+        "def" => Part.new(Dynamics::MF, notes: "/4 /4 /2 1".to_notes)
+      }).seconds_long.should eq(2)
+    end
+  end
+
   describe '#valid?' do
     {
       'valid part' => [ :parts => { "piano" => Samples::SAMPLE_PART }],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musicality
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler