ruby-mext 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 294779db24d6436cc838a41d8673fe440180e95a4dddf2e8cfa0ad6d70998552
-  data.tar.gz: c456b20be223a8b47589f9b9495465add2d50a3afa0063ec0634c27884ea2ce7
+  metadata.gz: d32aaa3192a101dd9ca1c51d9a9971de58e8b1d169101421fdc2bae2d3bab010
+  data.tar.gz: 9ba50c10d8f2681d37e5064b72d7767709fd902dd212a409044aeb6902438145
 SHA512:
-  metadata.gz: 563369c90b8d73a3f10b070e67051b870ff672ac8dd28ce79a5acac3d94c5aec041e590b42ce2361fe4e6483808c27e6bdaef368cb213f0328d551b5a88754a8
-  data.tar.gz: fd9e7b2c50a2ebb6b7da7f640a6f2aff96887a50194895cfbedbff0c31606640bacf62ef1e4265800af81836fc814a7965deba9c813f140126d2f5f019285524
+  metadata.gz: 5d92e921aed9ef6c445a341272382c60a2eac3d8f0fb7e3d8f78e61dc328036416bea8b8c8e5131d47fc97e72abb4e28215fc5bbcaa02bd91ca533d450db0875
+  data.tar.gz: ee4884242a2344ec9790755fb5cde3df9d1327da33c3dba1af0706a8c2f9b14223e88c1aa693db1b5d304d2539e59ea3057e96d3cd696e77576acebf52e54bf1

data/lib/mext/music/pitch_class.rb

@@ -6,15 +6,19 @@ module Mext
       attr_reader :octave, :semi
   
       #
-      # +Mext::Music::PitchClass.new(float_value):
+      # +Mext::Music::PitchClass.new(float_value, semi = nil)+:
       #
       # pitch class object, where argument is:
       #
       # +float_value+: a pitch class in float notation (i.e. 8.00 for middle C, etc.)
+      #                +or+ an octave value when given in octave, semi pair (see below)
+      # +semi+: (optional) when this argument is not nil, then it is assumed
+      #         that the first argument is the octave, and this one is the
+      #         semitone value
       #
       #:nodoc:
-      def initialize(fv)
-        setup(fv)
+      def initialize(fv, semi = nil)
+        semi ? setup_with_two_arguments(fv, semi) : setup_with_one_argument(fv)
       end
   
       #:doc:
@@ -29,7 +33,7 @@ module Mext
         # we suppose here that the pitch_class data is well-formed inside the
         # object
         #
-        self.octave + (self.semi / 100.0)
+        self.octave + (self.semi / ::Numeric::PCC)
       end
   
       #:doc:
@@ -59,11 +63,14 @@ module Mext
       # +\+(other)+ (operator plus)
       #
       # sums two pitch classes
-      # 
       #
       #:nodoc:
       def +(other)
-        PitchClass.new((self.to_freq + other.to_freq).cpspch)
+        octave = (self.to_semitones + other.to_semitones) / 12.0
+        octave = octave >= 0.0 ? octave.floor : octave.ceil
+        semis  = (self.to_semitones + other.to_semitones) % 12.0
+        phase  = octave >= 0.0 ? 1 : -1
+        PitchClass.new(octave, phase*semis)
       end
 
       #:doc:
@@ -75,7 +82,8 @@ module Mext
       #
       #:nodoc:
       def -(other)
-        PitchClass.new((self.to_freq - other.to_freq).cpspch)
+        tot_semi = self.to_semitones - other.to_semitones
+        PitchClass.new(0.0, tot_semi)
       end
 
       #:doc:
@@ -100,6 +108,17 @@ module Mext
         other.to_semitones - self.to_semitones
       end
 
+      #:doc:
+      #
+      # +transpose(semitones)+
+      #
+      # returns the transposition in semitones
+      #
+      #:nodoc:
+      def transpose(semi)
+        self + PitchClass.new(0.0, semi)
+      end
+
       class << self
   
         #:doc:
@@ -117,13 +136,38 @@ module Mext
   
     private
   
-      def setup(fval)
-        @octave = fval.floor
-        s = (fval-@octave) * 100.0
-        @octave += (s/12.0).floor
-        @semi = s % 12.0
+      def setup_with_one_argument(fval)
+        (o, s) = separate_oct_semi(fval)
+        setup_with_two_arguments(o, s)
       end
-  
+
+      def separate_oct_semi(fval)
+        octave = fval >= 0.0 ? fval.floor : fval.ceil
+        s = (fval-octave) * ::Numeric::PCC
+        [octave, s]
+      end
+
+      #
+      # +setup_with_two_arguments(oct, semi)+:
+      #
+      # we must make sure that the two values are congruent, that is:
+      # +oct+ is a float number and +semi+ is between 0..11.999999
+      # taking into account that pitch classes can be positive or negative
+      #
+      def setup_with_two_arguments(oct, s)
+        octsemi = (s / 12.0)
+        octsemi = case
+                  when octsemi > 0.0 then octsemi.floor
+                  when octsemi < 0.0 then octsemi.ceil
+                  when octsemi == 0.0 then 0.0
+                  end
+        oct += octsemi
+        remainder = s >= 0.0 ? (s % 12.0) : (s % -12.0)
+        @octave = oct
+        @semi = remainder
+        self
+      end
+
     end
 
   end

data/lib/mext/numeric/constants.rb

@@ -0,0 +1,34 @@
+class Numeric
+
+  #
+  # a set of constants needed for pitch classes and MIDI
+  #
+
+  #
+  # +MIDI_MIDDLE_C+: the central C (Do) in MIDI jargon
+  #
+  MIDI_MIDDLE_C = 60
+
+  #
+  # +PITCH_MIDDLE_C+: the central C (Do) in pitch-class jargon 
+  #
+  PITCH_MIDDLE_C = 8.0
+
+  #
+  # +CHROMATIC_NOTES_PER_OCTAVE+ (short: +CNPO+): the number of notes per octave  
+  #
+  CHROMATIC_NOTES_PER_OCTAVE = CNPO = 12.0
+
+  #
+  # +ZERO_MIDI_PITCH+ (short: +ZMP+): where does the +0.00+ pitch-class reside
+  # in terms of midi notes
+  #
+  ZERO_MIDI_PITCH = ZMP = MIDI_MIDDLE_C - (PITCH_MIDDLE_C * CNPO)
+
+  #
+  # +PITCH_CLASS_CENTS+ (short: +PCC+): the number of parts in every semitone
+  #
+  PITCH_CLASS_CENTS = PCC = 100.0
+
+
+end

data/lib/mext/numeric/mtopch.rb

@@ -9,12 +9,25 @@ class Numeric
 
   def mtopch
 
-    intv = (self - MIDI_MIDDLE_C) / CHROMATIC_NOTES_PER_OCTAVE
+    semi = (self - ZMP) / CNPO  
+    oct  = semi.to_i
+    semi = (semi - oct) * CNPO
+    semi %= CNPO
+    semi = (self > ZMP) ? semi : -((CNPO - semi) % CNPO)
 
-    intv_octave = intv.to_i
-    intv_semi = (intv - intv_octave) * CHROMATIC_NOTES_PER_OCTAVE;
+    oct + (semi / PCC)
+
+#   intv = self - MIDI_MIDDLE_C
+#   intv /= CHROMATIC_NOTES_PER_OCTAVE
+
+#   intv_octave = intv.floor
+#   intv_semi = (intv_octave >= 0.0) ? (intv - intv_octave) : (1 - (intv_octave - intv))
+#   
+#   intv_semi *= CHROMATIC_NOTES_PER_OCTAVE;
+#   intv_semi %= CHROMATIC_NOTES_PER_OCTAVE;
+
+#   PITCH_MIDDLE_C + intv_octave + (intv_semi/100.0);
 
-    PITCH_MIDDLE_C + intv_octave + (intv_semi/100.0);
   end
 
 end

data/lib/mext/numeric/pchtom.rb

@@ -6,9 +6,6 @@ class Numeric
   # interprets its receiver as a pitch class and returns its corresponing MIDI note
   #
   #:nodoc:
-  MIDI_MIDDLE_C = 60
-  PITCH_MIDDLE_C = 8.0
-  CHROMATIC_NOTES_PER_OCTAVE = 12.0
 
   def pchtom
     p_octave = self.to_i

data/lib/mext/numeric.rb

@@ -16,6 +16,7 @@ module Mext
       mmtot
     )
     NON_VECTORIZABLE_METHODS = %w(
+      constants
       pitch_fork
     )
     ADDED_METHODS = NON_VECTORIZABLE_METHODS + VECTORIZABLE_METHODS

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Mext
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mext
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Nicola Bernardini
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,6 +127,7 @@ files:
 - lib/mext/music/pitch_class.rb
 - lib/mext/numeric.rb
 - lib/mext/numeric/ampdb.rb
+- lib/mext/numeric/constants.rb
 - lib/mext/numeric/cpspch.rb
 - lib/mext/numeric/dbamp.rb
 - lib/mext/numeric/ftom.rb