lib/music-transcription/value_change.rb in music-transcription-0.3.0 vs lib/music-transcription/value_change.rb in music-transcription-0.4.0

@@ -10,76 +10,50 @@
 #
 # @!attribute [rw] value
 #   @return [Numeric] The value of the event.
 #
 class ValueChange
-  include Hashmake::HashMakeable
+  attr_accessor :value, :transition
 
-  attr_reader :value, :transition
-  
-  # hashed-arg specs (for hash-makeable idiom)
-  ARG_SPECS = {
-    :value => arg_spec(:reqd => true),
-    :transition => arg_spec(:reqd => false, :type => Transition, :default => ->(){ immediate() })
-  }
-
   # New instance of ValueChange.
   # @param [Hash] args Hashed arguments for initialization.
-  def initialize args
-    hash_make args, ValueChange::ARG_SPECS
+  def initialize value, transition = Transition::Immediate.new
+    @value = value
+    @transition = transition
   end
   
   # Compare the equality of another ValueChange object.
   def == other
     return (@value == other.value) &&
     (@transition == other.transition)
   end
   
   # Produce an identical ValueChange object
   def clone
-    return ValueChange.new(:value => @value, :transition => @transition)
+    return ValueChange.new(@value, @transition.clone)
   end
-
-  # Set the event value. Can be any object.
-  def value= value
-    ValueChange::ARG_SPECS[:value].validate_value value
-    @value = value
-  end
-
-  # Set the transition.
-  def transition= transition
-    ValueChange::ARG_SPECS[:transition].validate_value transition
-    @transition = transition
-  end
 end
 
 module_function
 
-# Creates a ValueChange object
-# @param [Object] value
-# @param [Transition] transition
-def value_change(value, transition = immediate())
-  return ValueChange.new(:value => value, :transition => transition)
-end
-
 # Creates a ValueChange object using an immediate transition.
 # @param [Object] value
 def immediate_change(value)
-  return ValueChange.new(:value => value, :transition => immediate())
+  return ValueChange.new(value, Transition::Immediate.new)
 end
 
 # Creates a ValueChange object using a linear transition.
 # @param [Object] value
 # @param [Transition] transition_duration Length of the transition
 def linear_change(value, transition_duration = 0.0)
-  return ValueChange.new(:value => value, :transition => linear(transition_duration))
+  return ValueChange.new(value, Transition::Linear.new(transition_duration))
 end
 
 # Creates a ValueChange object using a sigmoid transition.
 # @param [Object] value
 # @param [Transition] transition_duration Length of the transition
-def sigmoid_change(value, transition_duration = 0.0, abruptness = Transition::ARG_SPECS[:abruptness].default)
-  return ValueChange.new(:value => value, :transition => sigmoid(transition_duration, abruptness))
+def sigmoid_change(value, transition_duration = 0.0, abruptness = 0.5)
+  return ValueChange.new(value, Transition::Sigmoid.new(transition_duration, abruptness))
 end
 
 end
 end