music-transcription 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e410c49d0b013842573762574ed5406d7676843b
-  data.tar.gz: 425be325e12b0908c57c1897ebad82443e685f81
+  metadata.gz: 47821dcba8bd951fa6052d201b49c4253bf6a8c0
+  data.tar.gz: fc84a5d2ea369f1d17fcdf52a82e8d9a61bef9da
 SHA512:
-  metadata.gz: 6fffac146f3b86db14687f3bd1b7e348d883351a3d368f2a192142f36951e5ae8225bd13c98c5f8fd2c2773766b162354528d82e035a350e1c0c01b6bddc75d0
-  data.tar.gz: 942d91f19af6e77d8ab61714bfe43e6c35d36e186dbd6adce002b131a6211e182c999e83a6472418d4e100156c7321569ecee6532f714e452ce4ec2f82fd544e
+  metadata.gz: 20284ea1e670062928ef8dc4ea86a342392e6746c7b511ced9ea2e4843a5b9705ffee13302ce984d09d12a01a32ccd2a23e4a25ae8787597afe2e97df3740928
+  data.tar.gz: 0c9083eb4e7cc5841db15f0f873f3f0835b27b403f1cd428d7536dd9113f5c630e41a7af306f6e2c468d82c4bfe47911681c4eff5c47d6aa69309ca0d05d710f

data/lib/music-transcription.rb

@@ -1,5 +1,7 @@
 # basic core classes
 require 'music-transcription/version'
+require 'music-transcription/validatable'
+require 'music-transcription/errors'
 
 # code for transcribing (representing) music
 require 'music-transcription/pitch'
@@ -9,11 +11,10 @@ require 'music-transcription/accent'
 require 'music-transcription/accents'
 require 'music-transcription/change'
 require 'music-transcription/note'
-require 'music-transcription/profile'
-require 'music-transcription/dynamic'
 require 'music-transcription/dynamics'
 require 'music-transcription/part'
 require 'music-transcription/program'
 require 'music-transcription/tempo'
 require 'music-transcription/meter'
+require 'music-transcription/meters'
 require 'music-transcription/score'

data/lib/music-transcription/change.rb

@@ -7,10 +7,6 @@ class Change
   def initialize value, duration
     @value = value
     @duration = duration
-    
-    unless duration >= 0
-      raise ArgumentError, "duration #{duration} must be >= 0"
-    end
   end
   
   def ==(other)
@@ -20,15 +16,33 @@ class Change
   end
 
   class Immediate < Change
+    include Validatable
+    
     def initialize value
+      @check_methods = [ :ensure_zero_duration ]
       super(value,0)
     end
+    
+    def ensure_zero_duration
+      unless @duration == 0
+        raise ValueNotZeroError, "immediate change duration #{self.duration} must be 0"
+      end
+    end
   end
   
   class Gradual < Change
+    include Validatable
+    
     def initialize value, transition_duration
+      @check_methods = [ :ensure_positive_duration ]
       super(value, transition_duration)
     end
+    
+    def ensure_positive_duration
+      if @duration < 0
+        raise ValueNotPositiveError, "gradual change duration #{self.duration} must be >= 0"
+      end
+    end
   end
 end
 

data/lib/music-transcription/dynamics.rb

@@ -1,14 +1,14 @@
 module Music
 module Transcription
-module Dynamics  
-  PPP = Dynamic::Pianississimo.new
-  PP = Dynamic::Pianissimo.new
-  P = Dynamic::Piano.new
-  MP = Dynamic::MezzoPiano.new
-  MF = Dynamic::MezzoForte.new
-  F = Dynamic::Forte.new
-  FF = Dynamic::Fortissimo.new
-  FFF = Dynamic::Fortississimo.new
+module Dynamics
+  PPP = 0.125
+  PP = 0.25
+  P = 0.375
+  MP = 0.5
+  MF = 0.625
+  F = 0.75
+  FF = 0.875
+  FFF = 1.0
 end
 end
 end

data/lib/music-transcription/errors.rb

@@ -1,5 +1,10 @@
 module Music
 module Transcription
-  class ValueNotPositiveError < RuntimeError;
-  class ValueOutOfRangeError < RuntimeError;
+  class ValueNotPositiveError < StandardError; end
+  class ValueOutOfRangeError < StandardError; end
+  class ValueNotZeroError < StandardError; end
+  class NotPositiveIntegerError < StandardError; end
+  class SegmentNotIncreasingError < StandardError; end
+  class SegmentNegativeError < StandardError; end
 end
+end

data/lib/music-transcription/meter.rb

@@ -2,12 +2,27 @@ module Music
 module Transcription
 
 class Meter
+  include Validatable
   
   attr_reader :measure_duration, :beat_duration, :beats_per_measure
   def initialize beats_per_measure, beat_duration
     @beats_per_measure = beats_per_measure
     @beat_duration = beat_duration
     @measure_duration = beats_per_measure * beat_duration
+    
+    @check_methods = [ :check_beats_per_measure, :check_beat_duration ]
+  end
+  
+  def check_beats_per_measure
+    unless @beats_per_measure.is_a?(Integer) && @beats_per_measure > 0
+      raise NotPositiveIntegerError, "beats per measure #{@beats_per_measure} is not a positive integer"
+    end
+  end
+    
+  def check_beat_duration
+    unless @beat_duration > 0
+      raise ValueNotPositiveError, "beat duration #{@beat_duration} is not positive"
+    end
   end
   
   def ==(other)

data/lib/music-transcription/meters.rb

@@ -0,0 +1,11 @@
+module Music
+module Transcription
+module Meters
+  TWO_TWO = Meter.new(2,"1/2".to_r)
+  TWO_FOUR = Meter.new(2,"1/4".to_r)
+  THREE_FOUR = Meter.new(3,"1/4".to_r)
+  FOUR_FOUR = Meter.new(4,"1/4".to_r)
+  SIX_EIGHT = Meter.new(6,"1/8".to_r)
+end
+end
+end

data/lib/music-transcription/note.rb

@@ -4,14 +4,23 @@ module Transcription
 require 'set'
 
 class Note
-  attr_reader :duration, :pitches, :links
-  attr_accessor :accent
+  include Validatable
+  
+  attr_reader :pitches, :links
+  attr_accessor :accent, :duration
 
   def initialize duration, pitches = [], links: {}, accent: Accents::NONE
     self.duration = duration
     @pitches = Set.new(pitches).sort
     @links = links
-    self.accent = accent
+    @duration = duration
+    @accent = accent
+    
+    @check_methods = [ :ensure_positive_duration ]
+  end
+  
+  def ensure_positive_duration
+    raise ValueNotPositiveError, "duration #{@duration} is not positive" if @duration <= 0
   end
   
   def == other
@@ -20,14 +29,6 @@ class Note
     (@links.to_a.sort == other.links.to_a.sort) &&
     (@accent == other.accent)
   end
-
-  # Set the note duration.
-  # @param [Numeric] duration The duration to use.
-  # @raise [ArgumentError] if duration is not greater than 0.
-  def duration= duration
-    raise ValueNotPositiveError if duration <= 0
-    @duration = duration
-  end
   
   def clone
     Marshal.load(Marshal.dump(self))
@@ -61,6 +62,10 @@ class Note
     return self
   end
   
+  def valid?
+    @duration > 0
+  end
+  
   class Sixteenth < Note
     def initialize pitches = [], links: {}, accent: Accents::NONE
       super(Rational(1,16),pitches,links:links,accent:accent)

data/lib/music-transcription/part.rb

@@ -4,6 +4,8 @@ module Music
 module Transcription
 
 class Part
+  include Validatable
+  
   attr_reader :start_dynamic, :dynamic_changes, :notes
   
   def initialize start_dynamic, notes: [], dynamic_changes: {}
@@ -11,11 +13,13 @@ class Part
     @start_dynamic = start_dynamic
     @dynamic_changes = dynamic_changes
     
-    d = self.duration
-    badkeys = dynamic_changes.keys.select {|k| k < 0 || k > d }
-    if badkeys.any?
-      raise ArgumentError, "dynamic profile has changes outside 0..d"
-    end
+    @check_methods = [:ensure_start_dynamic, :ensure_dynamic_change_values_range 
+      #:ensure_dynamic_change_offsets
+    ]
+  end
+  
+  def validatables
+    @notes + @dynamic_changes.values
   end
   
   def clone
@@ -31,6 +35,27 @@ class Part
   def duration
     return @notes.inject(0) { |sum, note| sum + note.duration }
   end
+  
+  def ensure_start_dynamic
+    unless @start_dynamic.between?(0,1)
+      raise RangeError, "start dynamic #{@start_dynamic} is not between 0 and 1"
+    end
+  end
+
+  #def ensure_dynamic_change_offsets
+  #  d = self.duration
+  #  outofrange = @dynamic_changes.keys.select {|k| !k.between?(0,d) }
+  #  if outofrange.any?
+  #    raise RangeError, "dynamic change offsets #{outofrange} are not between 0 and #{d}"
+  #  end
+  #end
+  
+  def ensure_dynamic_change_values_range
+    outofrange = @dynamic_changes.values.select {|v| !v.value.between?(0,1) }
+    if outofrange.any?
+      raise RangeError, "dynamic change values #{outofrange} are not between 0 and 1"
+    end
+  end
 end
 
 end

data/lib/music-transcription/program.rb

@@ -6,12 +6,15 @@ module Transcription
 # @author James Tunnell
 #
 class Program
+  include Validatable
+  
   attr_accessor :segments
 
   # A new instance of Program.
   # @param [Hash] args Hashed arguments. Required key is :segments.
   def initialize segments = []
     @segments = segments
+    @check_methods = [:ensure_increasing_segments, :ensure_nonnegative_segments]
   end
 
   # @return [Float] the sum of all program segment lengths
@@ -21,8 +24,7 @@ class Program
   
     # compare to another Program
   def == other
-#    raise ArgumentError, "program is invalid" if !self.valid?    
-    return @segments == other.segments
+    return other.respond_to?(:segments) && @segments == other.segments
   end
 
   def include? offset
@@ -33,74 +35,20 @@ class Program
     end
     return false
   end
-
-  # For the given note elapsed, what will the note offset be?
-  #
-  def note_offset_for elapsed
-    raise ArgumentError, "elapsed #{elapsed} is less than 0.0" if elapsed < 0.0
-    raise ArgumentError, "elapsed #{elapsed} is greater than program length" if elapsed > self.length
-    
-    so_far = 0.0
-    
-    @segments.each do |segment|
-      segment_length = segment.last - segment.first
-      
-      if (segment_length + so_far) > elapsed
-        return segment.first + (elapsed - so_far)
-      else
-        so_far += segment_length
-      end
-    end
-    
-    raise "offset not determined even though the given elapsed is less than program length!"
-  end
   
-  # For the given note offset in the score, how much note will have elapsed to 
-  # get there according to the program?
-  #
-  def note_elapsed_at offset
-    raise ArgumentError, "offset #{offset} is not included in program" if !self.include?(offset)
-    
-    elapsed = 0.0
-    
-    @segments.each do |segment|
-      if segment.include?(offset)
-        elapsed += (offset - segment.first)
-        break
-      else
-        elapsed += (segment.last - segment.first)
-      end
+  def ensure_increasing_segments
+    non_increasing = @segments.select {|seg| seg.first >= seg.last }
+    if non_increasing.any?
+      raise SegmentNotIncreasingError, "Non-increasing segments found #{non_increasing}"
     end
-    
-    return elapsed
   end
   
-  # For the given note offset in the score, how much time will have elapsed to 
-  # get there according to the program?
-  #
-  def time_elapsed_at offset, note_time_converter
-    raise ArgumentError, "offset #{offset} is not included in program" if !self.include?(offset)
-
-    elapsed = 0.0
-    
-    @segments.each do |segment|
-      if segment.include?(offset)
-        elapsed += note_time_converter.time_elapsed(segment.first, offset)
-        break
-      else
-        elapsed += note_time_converter.time_elapsed(segment.first, segment.last)
-      end
+  def ensure_nonnegative_segments
+    negative = @segments.select {|seg| seg.first < 0 || seg.last < 0 }
+    if negative.any?
+      raise SegmentNegativeError, "Negative segments found #{negative}"
     end
-    
-    return elapsed
   end
-  
-end
-
-module_function
-
-def program segments
-  Program.new(:segments => segments)
 end
 
 end

data/lib/music-transcription/score.rb

@@ -2,6 +2,8 @@ module Music
 module Transcription
 
 class Score
+  include Validatable
+  
   attr_reader :start_meter, :start_tempo, :parts, :program, :meter_changes, :tempo_changes
   
   def initialize start_meter, start_tempo, meter_changes: {}, tempo_changes: {}, parts: {}, program: Program.new
@@ -11,6 +13,54 @@ class Score
     @tempo_changes = tempo_changes
     @parts = parts
     @program = program
+    
+    @check_methods = [ :check_start_tempo, :check_tempo_changes,
+      #:check_tempo_change_offsets, :check_meter_change_offsets,
+      :check_meter_changes ]
+  end
+  
+  def validatables
+    return [ @program, @start_meter ] +
+      @tempo_changes.values +
+      @meter_changes.values + 
+      @meter_changes.values.map {|v| v.value} +
+      @parts.values 
+  end
+  
+  def check_start_tempo
+    unless @start_tempo > 0
+      raise ValueNotPositiveError, "start tempo #{@start_tempo} is not positive"
+    end
+  end
+  
+  def check_tempo_changes
+    negative = @tempo_changes.select {|k,v| v.value <= 0}
+    if negative.any?
+      raise ValueNotPositiveError, "tempo changes #{negative} are not positive"
+    end
+  end
+  
+  #def check_tempo_change_offsets
+  #  d = self.duration
+  #  outofrange = @tempo_changes.keys.select {|k| !k.between?(0,d) }
+  #  if outofrange.any?
+  #    raise RangeError, "tempo change offsets #{outofrange} are not between 0 and #{d}"
+  #  end
+  #end
+  #
+  #def check_meter_change_offsets
+  #  d = self.duration
+  #  outofrange = @meter_changes.keys.select {|k| !k.between?(0,d) }
+  #  if outofrange.any?
+  #    raise RangeError, "meter change offsets #{outofrange} are not between 0 and #{d}"
+  #  end
+  #end
+  
+  def check_meter_changes
+    nonzero_duration = @meter_changes.select {|k,v| v.duration != 0 }
+    if nonzero_duration.any?
+      raise ValueNotZeroError, "meter changes #{nonzero_duration} have non-zero duration"
+    end
   end
 
   def clone
@@ -28,7 +78,7 @@ class Score
     
   def duration
     @parts.map {|p| p.duration }.max
-  end
+  end  
 end
 
 end

data/lib/music-transcription/validatable.rb

@@ -0,0 +1,31 @@
+# assumes that @checks is defined as an array of no-arg lambdas, each
+# lambda raising an error (with useful msg) when check fails
+module Validatable
+  attr_reader :errors
+  
+  def validate
+    @errors = []
+    @check_methods.each do |check_method|
+      begin
+        send(check_method)
+      rescue StandardError => e
+        @errors.push e
+      end
+    end
+    if respond_to?(:validatables)
+      validatables.each do |v|
+        @errors += v.validate
+      end
+    end
+    return @errors
+  end
+  
+  def valid?
+    self.validate
+    @errors.empty?
+  end
+  
+  def invalid?
+    !self.valid?
+  end
+end

data/lib/music-transcription/version.rb

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

data/spec/meter_spec.rb

@@ -47,4 +47,33 @@ describe Meter do
       YAML.load(m.to_yaml).should eq m
     end
   end
+  
+  describe '#valid?' do
+    {
+      '4/4 meter' => [4,'1/4'.to_r],
+      '2/4 meter' => [2,'1/4'.to_r],
+      '3/4 meter' => [2,'1/4'.to_r],
+      '6/8 meter' => [6,'1/8'.to_r],
+      '12/8 meter' => [12,'1/8'.to_r],
+    }.each do |context_str,args|
+      context context_str do
+        it 'should return true' do
+          Score.new(*args).should be_valid
+        end
+      end
+    end
+    
+    {
+      'non-integer positive beats per measure' => [4.0,"1/4".to_r],
+      'integer negative beats per measure' => [-1,"1/4".to_r],
+      'zero beat duration' => [4,0.to_r],
+      'negative beat duration' => [4,-1.to_r],
+    }.each do |context_str,args|
+      context context_str do
+        it 'should return false' do
+          Score.new(*args).should be_invalid
+        end
+      end      
+    end
+  end
 end

data/spec/note_spec.rb

@@ -102,4 +102,26 @@ describe Note do
       YAML.load(n.to_yaml).should eq n
     end
   end
+  
+  describe '#valid?' do
+    context 'note with positive duration' do
+      it 'should return true' do
+        Note.new(1,[C2]).should be_valid
+      end
+    end
+    
+    context 'note with 0 duration' do
+      it 'should return false' do
+        Note.new(0,[C2]).should be_invalid
+        require 'pry'
+        binding.pry
+      end
+    end
+    
+    context 'note with negative duration' do
+      it 'should be invalid' do
+        Note.new(-1,[C2]).should be_invalid
+      end
+    end
+  end
 end

data/spec/part_spec.rb

@@ -26,4 +26,47 @@ describe Part do
       YAML.load(p.to_yaml).should eq p
     end
   end
+  
+  describe '#valid?' do
+    { 'negative start dynamic' => [-0.01],
+      'start dynamic > 1' => [1.01],
+      #'dynamic change offsets outside 0..d' => [
+      #  0.5, :notes => [ Note::Whole.new ],
+      #  :dynamic_changes => { 1.2 => Change::Immediate.new(0.5) }],
+      #'dynamic change offsets outside 0..d' => [
+      #  0.5, :notes => [ Note::Whole.new ],
+      #  :dynamic_changes => { -0.2 => Change::Immediate.new(0.5) }],
+      'dynamic change values outside 0..1' => [
+        0.5, :notes => [ Note::Whole.new ],
+        :dynamic_changes => { 0.2 => Change::Immediate.new(-0.01), 0.3 => Change::Gradual.new(1.01,0.2) }],
+      'notes with 0 duration' => [ 0.5, :notes => [ Note.new(0) ]],
+      'notes with negative duration' => [ 0.5, :notes => [ Note.new(-1) ]],
+      'gradual change with negative duration' => [
+        0.5, :notes => [ Note.new(1) ],
+        :dynamic_changes => { 0.2 => Change::Gradual.new(0.6,-0.1) }]
+    }.each do |context_str, args|
+      context context_str do
+        it 'should return false' do
+          Part.new(*args).should be_invalid
+        end
+      end
+    end
+    
+    {
+      'valid notes' => [ Dynamics::PP,
+        :notes => [ Note::Whole.new, Note::Quarter.new([C5]) ]],
+      'valid dynamic values' => [ Dynamics::MF,
+        :notes => [ Note::Whole.new([C4]), Note::Quarter.new ],
+        :dynamic_changes => {
+          0.5 => Change::Immediate.new(Dynamics::MP),
+          1.2 => Change::Gradual.new(Dynamics::FF, 0.05) } ],
+    }.each do |context_str, args|
+      context context_str do
+        it 'should return true' do
+          part = Part.new(*args)
+          part.should be_valid
+        end
+      end
+    end
+  end
 end

data/spec/program_spec.rb

@@ -28,28 +28,23 @@ describe Program do
     end
   end
   
-  describe "#note_elapsed_at" do
-    before :each do
-      segments = [ 0.0...5.0, 0.0...4.0, 5.0..10.0 ]
-      @program = Program.new segments
-    end
-
-    it "should return 0.0 at program start" do
-      @program.note_elapsed_at(@program.segments.first.first).should eq(0.0)
-    end
-
-    it "should return program length at program stop" do
-      @program.note_elapsed_at(@program.segments.last.last).should eq(@program.length)
+  describe '#valid?' do
+    context 'increasing, positive segments' do
+      it 'should return true' do
+        Program.new([0..2,1..2,0..4]).should be_valid
+      end
     end
-
-    it "should return correct note elapsed for any included offset" do
-      @program.note_elapsed_at(2.5).should eq(2.5)
-      @program.note_elapsed_at(5.5).should eq(9.5)
+    
+    context 'decreasing, positive segments' do
+      it 'should return false' do
+        Program.new([2..0,2..1,04..0]).should be_invalid
+      end
     end
 
-    it "should raise error if offset is not included" do
-      lambda { @program.note_elapsed_at(-0.000001) }.should raise_error
-      lambda { @program.note_elapsed_at(10.000001) }.should raise_error
+    context 'increasing, negative segments' do
+      it 'should return false' do
+        Program.new([-1..2,-2..0,-2..2]).should be_invalid
+      end
     end
   end
 end

data/spec/score_spec.rb

@@ -3,20 +3,20 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe Score do
   describe '#initialize' do
     it 'should use empty containers for parameters not given' do
-      s = Score.new(Meter.new(4,4),120)
+      s = Score.new(FOUR_FOUR,120)
       s.parts.should be_empty
       s.program.segments.should be_empty
     end
     
     it 'should assign given parameters' do
-      m = Meter.new(4,"1/4".to_r)
+      m = FOUR_FOUR
       s = Score.new(m,120)
       s.start_meter.should eq m
       s.start_tempo.should eq 120
       
       parts = { "piano (LH)" => Samples::SAMPLE_PART }
       program = Program.new [0...0.75, 0...0.75]
-      mcs = { 1 => Change::Immediate.new(Meter.new(3,"1/4".to_r)) }
+      mcs = { 1 => Change::Immediate.new(THREE_FOUR) }
       tcs = { 1 => Change::Immediate.new(100) }
       
       s = Score.new(m,120,
@@ -31,4 +31,39 @@ describe Score do
       s.tempo_changes.should eq tcs
     end
   end
+  
+  describe '#valid?' do
+    {
+      'just valid start meter and tempo' => [ FOUR_FOUR, 120 ],
+      'valid meter changes' => [ FOUR_FOUR, 120,
+        :meter_changes => { 1 => Change::Immediate.new(TWO_FOUR) } ],
+      'valid tempo changes' => [ FOUR_FOUR, 120,
+        :tempo_changes => { 1 => Change::Gradual.new(200, 2), 2 => Change::Immediate.new(300) } ],
+      'valid part' => [ FOUR_FOUR, 120, :parts => { "piano" => Samples::SAMPLE_PART }],
+      'valid program' => [ FOUR_FOUR, 120, :program => Program.new([0..2,0..2]) ]
+    }.each do |context_str,args|
+      context context_str do
+        it 'should return true' do
+          Score.new(*args).should be_valid
+        end
+      end
+    end
+    
+    {
+      'invalid start tempo' => [ FOUR_FOUR, -1],
+      'invalid start meter' => [ Meter.new(-1,"1/4".to_r), 120],
+      'invalid meter in change' => [ FOUR_FOUR, 120,
+        :meter_changes => { 1 => Change::Immediate.new(Meter.new(-2,"1/4".to_r)) } ],
+      'non-immediate meter change' => [ FOUR_FOUR, 120,
+        :meter_changes => { 1 => Change::Gradual.new(TWO_FOUR,1) } ],
+      'invalid part' => [ FOUR_FOUR, 120, :parts => { "piano" => Part.new(-0.1) }],
+      'invalid program' => [ FOUR_FOUR, 120, :program => Program.new([2..0]) ],
+    }.each do |context_str,args|
+      context context_str do
+        it 'should return false' do
+          Score.new(*args).should be_invalid
+        end
+      end      
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,8 @@ require 'rspec'
 require 'music-transcription'
 
 include Music::Transcription
-include Music::Transcription::Pitches
+include Pitches
+include Meters
 
 class Samples
   SAMPLE_PART = Part.new(
@@ -14,4 +15,16 @@ class Samples
     ],
     dynamic_changes: {1.0 => Change::Immediate.new(Dynamics::MP)}
   )
-end
+end
+
+RSpec::Matchers.define :be_valid do
+  match do |obj|
+    obj.valid?
+  end
+end
+
+RSpec::Matchers.define :be_invalid do
+  match do |obj|
+    obj.invalid?
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: music-transcription
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,19 +154,19 @@ files:
 - lib/music-transcription/accent.rb
 - lib/music-transcription/accents.rb
 - lib/music-transcription/change.rb
-- lib/music-transcription/dynamic.rb
 - lib/music-transcription/dynamics.rb
 - lib/music-transcription/errors.rb
 - lib/music-transcription/link.rb
 - lib/music-transcription/meter.rb
+- lib/music-transcription/meters.rb
 - lib/music-transcription/note.rb
 - lib/music-transcription/part.rb
 - lib/music-transcription/pitch.rb
 - lib/music-transcription/pitches.rb
-- lib/music-transcription/profile.rb
 - lib/music-transcription/program.rb
 - lib/music-transcription/score.rb
 - lib/music-transcription/tempo.rb
+- lib/music-transcription/validatable.rb
 - lib/music-transcription/version.rb
 - music-transcription.gemspec
 - spec/change_spec.rb
@@ -176,7 +176,6 @@ files:
 - spec/note_spec.rb
 - spec/part_spec.rb
 - spec/pitch_spec.rb
-- spec/profile_spec.rb
 - spec/program_spec.rb
 - spec/score_spec.rb
 - spec/spec_helper.rb
@@ -214,7 +213,6 @@ test_files:
 - spec/note_spec.rb
 - spec/part_spec.rb
 - spec/pitch_spec.rb
-- spec/profile_spec.rb
 - spec/program_spec.rb
 - spec/score_spec.rb
 - spec/spec_helper.rb

data/lib/music-transcription/dynamic.rb

@@ -1,27 +0,0 @@
-module Music
-module Transcription
-
-# Defines a dynamic level
-#
-# @author James Tunnell
-#
-class Dynamic
-  def ==(other)
-    self.class == other.class
-  end
-  
-  def clone
-    self.class.new
-  end
-  
-  [
-    :Piano, :Pianissimo, :Pianississimo,
-    :MezzoPiano, :MezzoForte,
-    :Forte, :Fortissimo, :Fortississimo
-  ].each do |name|
-    Dynamic.const_set(name, Class.new(Dynamic))
-  end
-end
-
-end
-end

data/lib/music-transcription/profile.rb

@@ -1,148 +0,0 @@
-module Music
-module Transcription
-
-# Represent a setting that can change over time.
-# 
-# @author James Tunnell
-#
-class Profile
-  attr_accessor :start_value, :value_changes
-
-  def initialize start_value, value_changes = {}
-    @start_value = start_value
-    @value_changes = value_changes
-  end
-  
-  # Compare to another Profile object.
-  def == other
-    (self.start_value == other.start_value) &&
-    (self.value_changes == other.value_changes)
-  end
-  
-  # Produce an identical Profile object.
-  def clone
-    Marshal.load(Marshal.dump(self))
-  end
-  
-  def last_value
-    if @value_changes.empty?
-      return @start_value
-    else
-      return @value_changes[@value_changes.keys.max].value
-    end
-  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 stretch ratio
-    self.clone.stretch! ratio
-  end
-
-  def stretch! ratio
-    @value_changes = Hash[ @value_changes.map {|k,v| [k*ratio,v] }]
-    return self
-  end
-  
-  def append profile, offset
-    self.clone.append! profile
-  end
-
-  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
-  
-  # Returns true if start value and value changes all are between given A and B.
-  def values_between? a, b
-    is_ok = self.start_value.between?(a,b)
-    
-    if is_ok
-      self.value_changes.each do |offset, setting|
-        setting.value.between?(a,b)
-      end
-    end
-    return is_ok
-  end
-
-  # Returns true if start value and value changes all are greater than zero.
-  def values_positive?
-    is_ok = self.start_value > 0.0
-    
-    if is_ok
-      self.value_changes.each do |offset, setting|
-        setting.value > 0.0
-      end
-    end
-    return is_ok
-  end
-  
-  def clone_and_collate computer_class, program_segments
-    new_profile = Profile.new start_value
-    
-    segment_start_offset = 0.0
-    comp = computer_class.new(self)
-    
-    program_segments.each do |seg|
-      # figure which dynamics to keep/modify
-      changes = Marshal.load(Marshal.dump(value_changes))
-      changes.keep_if {|offset,change| seg.include?(offset) }
-      changes.each do |offset, change|
-	if(offset + change.transition.duration) > seg.last
-	  change.transition.duration = seg.last - offset
-	  change.value = comp.value_at seg.last
-	end
-      end
-      
-      # find & add segment start value first
-      value = comp.value_at seg.first
-      offset = segment_start_offset
-      new_profile.value_changes[offset] = value_change(value)
-      
-      # add changes to part, adjusting for segment start offset
-      changes.each do |offset2, change|
-	offset3 = (offset2 - seg.first) + segment_start_offset
-	new_profile.value_changes[offset3] = change
-      end
-      
-      segment_start_offset += (seg.last - seg.first)
-    end
-    
-    return new_profile
-  end
-end
-
-end
-end

data/spec/profile_spec.rb

@@ -1,163 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Profile do
-  
-  context '.new' do
-    it "should assign start value given during construction" do
-      p = Profile.new(0.2)
-      p.start_value.should eq(0.2)
-    end
-    
-    it "should assign settings given during construction" do
-      p = Profile.new(0.2,
-        1.0 => Change::Immediate.new(0.5),
-        1.5 => Change::Immediate.new(1.0)
-      )
-      p.value_changes[1.0].value.should eq(0.5)
-      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 '#stretch!' do
-    it 'should multiply change offsets by ratio' do
-      p = Profile.new(0.0, 5.0 => Change::Immediate.new(0.1), 7.5 => Change::Immediate.new(0.2))
-      p.stretch!(1)
-      p.value_changes[5.0].value.should eq(0.1)
-      p.value_changes[7.5].value.should eq(0.2)
-      p.stretch!("3/2".to_r)
-      p.value_changes[7.5].value.should eq(0.1)
-      p.value_changes[11.25].value.should eq(0.2)
-      p.stretch!("2/3".to_r)
-      p.value_changes[5.0].value.should eq(0.1)
-      p.value_changes[7.5].value.should eq(0.2)
-    end
-  end
-  
-  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,1.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