ruby-mext 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d32aaa3192a101dd9ca1c51d9a9971de58e8b1d169101421fdc2bae2d3bab010
-  data.tar.gz: 9ba50c10d8f2681d37e5064b72d7767709fd902dd212a409044aeb6902438145
+  metadata.gz: 765a069de73dccde01080cc08b7dc773781bc26f5dd5f3181a4d01e1bbdd04f2
+  data.tar.gz: bd1a550f9cce944c99c0fdd863696d99784eca0536278d19ec7768df45a775b0
 SHA512:
-  metadata.gz: 5d92e921aed9ef6c445a341272382c60a2eac3d8f0fb7e3d8f78e61dc328036416bea8b8c8e5131d47fc97e72abb4e28215fc5bbcaa02bd91ca533d450db0875
-  data.tar.gz: ee4884242a2344ec9790755fb5cde3df9d1327da33c3dba1af0706a8c2f9b14223e88c1aa693db1b5d304d2539e59ea3057e96d3cd696e77576acebf52e54bf1
+  metadata.gz: f3de1073d0fb33c9dd5a1fd29eae1ea17ede3915a644478ed452780de20e75c2fe3ea15464fab9515e0c0c9331e83e879a77c55f382d156443c96022143a2016
+  data.tar.gz: c601e4e6f42b862f06238878a2a55bed482311851fc05e8b30c74f3904ed24ae202d9c61c963d73e3bef6929661494533de7ad8409c4a95186a52c1caefc2e45

data/lib/mext/music/pitch_class.rb

@@ -66,9 +66,9 @@ module Mext
       #
       #:nodoc:
       def +(other)
-        octave = (self.to_semitones + other.to_semitones) / 12.0
+        octave = ((self.to_semitones + other.to_semitones) / 12.0).cround
         octave = octave >= 0.0 ? octave.floor : octave.ceil
-        semis  = (self.to_semitones + other.to_semitones) % 12.0
+        semis  = (self.to_semitones + other.to_semitones).cround % 12.0
         phase  = octave >= 0.0 ? 1 : -1
         PitchClass.new(octave, phase*semis)
       end
@@ -93,7 +93,7 @@ module Mext
       # returns the +PitchClass+ to a number of semitones
       #
       def to_semitones
-        (self.octave * 12.0) + self.semi
+        self.to_f.pchtosemi
       end
   
       #:doc:
@@ -119,6 +119,19 @@ module Mext
         self + PitchClass.new(0.0, semi)
       end
 
+      #:doc:
+      #
+      # +interval_proportion(prop, other)+:
+      #
+      # returns the interval proportion (in semitones) given
+      #
+      # - +prop+: a proportional factor (should be in the range 0-1)
+      # - +other+: the other pitch
+      #
+      def interval_proportion(prop, other)
+        self.interval(other) * prop
+      end
+
       class << self
   
         #:doc:
@@ -135,6 +148,10 @@ module Mext
       end
   
     private
+
+      def setup_with_one_semitone_argument(semival)
+        setup_with_one_argument(semival.semitopch)
+      end
   
       def setup_with_one_argument(fval)
         (o, s) = separate_oct_semi(fval)

data/lib/mext/numeric/constants.rb

@@ -19,11 +19,17 @@ class Numeric
   #
   CHROMATIC_NOTES_PER_OCTAVE = CNPO = 12.0
 
+  #
+  # +ZERO_PITCH+ (short: +ZP+): where does the +0.00+ pitch-class reside
+  # in terms of semitones (+96)
+  #
+  ZERO_PITCH = ZP = PITCH_MIDDLE_C * CNPO
+
   #
   # +ZERO_MIDI_PITCH+ (short: +ZMP+): where does the +0.00+ pitch-class reside
-  # in terms of midi notes
+  # in terms of midi notes (-36)
   #
-  ZERO_MIDI_PITCH = ZMP = MIDI_MIDDLE_C - (PITCH_MIDDLE_C * CNPO)
+  ZERO_MIDI_PITCH = ZMP = MIDI_MIDDLE_C - ZERO_PITCH
 
   #
   # +PITCH_CLASS_CENTS+ (short: +PCC+): the number of parts in every semitone

data/lib/mext/numeric/cround.rb

@@ -0,0 +1,18 @@
+class Numeric
+
+  #
+  # +cround(eps = 1e-8)+: conditional rounding algorithm
+  #
+  # +cround+ will return a rounded number if the starting value is nearer to
+  #          its nearest integer by less than +eps+. Otherwise it will not round
+  #          the receiver
+  #
+  #:nodoc:
+  DEFAULT_CROUND_EPS = 1e-8
+
+  def cround(eps = DEFAULT_CROUND_EPS)
+    rv = self.round
+    ((self - rv).abs < eps) ? rv : self
+  end
+
+end

data/lib/mext/numeric/mtopch.rb

@@ -1,5 +1,6 @@
 class Numeric
 
+  #:doc:
   #
   # +mtopch+: MIDI note to pitch class converter
   #
@@ -9,24 +10,7 @@ class Numeric
 
   def mtopch
 
-    semi = (self - ZMP) / CNPO  
-    oct  = semi.to_i
-    semi = (semi - oct) * CNPO
-    semi %= CNPO
-    semi = (self > ZMP) ? semi : -((CNPO - semi) % CNPO)
-
-    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);
+    (self - ZMP).semitopch
 
   end
 

data/lib/mext/numeric/pchtom.rb

@@ -8,16 +8,7 @@ class Numeric
   #:nodoc:
 
   def pchtom
-    p_octave = self.to_i
-    p_note = (self - p_octave) * 100
-    ref = self < 0.0 ? -CHROMATIC_NOTES_PER_OCTAVE : CHROMATIC_NOTES_PER_OCTAVE
-
-    p_octave += (p_note / CHROMATIC_NOTES_PER_OCTAVE).to_i # cater for octave wrapping
-    p_note   = (p_note % ref);                             # reduce note in a 0-11 space (keeping track of sign)
-
-    m_octave = ((p_octave - PITCH_MIDDLE_C)*CHROMATIC_NOTES_PER_OCTAVE) + MIDI_MIDDLE_C; # find the appropriate midi octave
-
-    m_octave + p_note
+    self.pchtosemi + ZMP
   end
 
 end

data/lib/mext/numeric/pchtooctsemi.rb

@@ -0,0 +1,24 @@
+class Numeric
+
+  #:doc:
+  #
+  # +pchtooctsemi+: pitch class to [octave, semitones] converter
+  #
+  # interprets its receiver as a pitch class and returns an array
+  # in the format [+octave+, +semitones+]
+  #
+  #:nodoc:
+
+  def pchtooctsemi
+    p_octave = self.to_i
+    p_note = (self - p_octave) * 100
+    ref = self < 0.0 ? -CHROMATIC_NOTES_PER_OCTAVE : CHROMATIC_NOTES_PER_OCTAVE
+
+    p_octave += (p_note / CHROMATIC_NOTES_PER_OCTAVE).to_i # cater for octave wrapping
+    p_note   = (p_note % ref);                             # reduce note in a 0-11 space (keeping track of sign)
+
+    [p_octave, p_note]
+  end
+
+end
+

data/lib/mext/numeric/pchtosemi.rb

@@ -0,0 +1,18 @@
+class Numeric
+
+  #:doc:
+  #
+  # +pchtosemi+: pitch class to semitones converter
+  #
+  # interprets its receiver as a pitch class and returns the
+  # corresponding quantity in semitones
+  #
+  #:nodoc:
+
+  def pchtosemi
+    (p_octave, p_note) = self.pchtooctsemi
+
+    (p_octave * CNPO) + p_note
+  end
+
+end

data/lib/mext/numeric/semitopch.rb

@@ -0,0 +1,23 @@
+class Numeric
+
+  #:doc:
+  #
+  # +semitopch+: semitone to pitch class converter
+  #
+  # interprets its receiver as a semitone quantity (starting from 0 at
+  # pitch class 0.00) and returns its corresponing pitch class
+  #
+  #:nodoc:
+
+  def semitopch
+
+    oct  = (self / CNPO).to_i
+    semi = self - (oct * CNPO)
+    semi %= CNPO
+    semi = (self >= 0.0) ? semi : -((CNPO - semi) % CNPO)
+
+    oct + (semi / PCC)
+
+  end
+
+end

data/lib/mext/numeric.rb

@@ -3,10 +3,14 @@ module Mext
 
     PATH = File.join(Mext::PATH, 'numeric')
     VECTORIZABLE_METHODS = %w(
+      cround
       mtof
       ftom
       ampdb
       dbamp
+      pchtooctsemi
+      pchtosemi
+      semitopch
       pchtom
       mtopch
       cpspch

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mext
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Nicola Bernardini
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,7 @@ files:
 - lib/mext/numeric/ampdb.rb
 - lib/mext/numeric/constants.rb
 - lib/mext/numeric/cpspch.rb
+- lib/mext/numeric/cround.rb
 - lib/mext/numeric/dbamp.rb
 - lib/mext/numeric/ftom.rb
 - lib/mext/numeric/gold.rb
@@ -137,8 +138,11 @@ files:
 - lib/mext/numeric/mtopch.rb
 - lib/mext/numeric/pchcps.rb
 - lib/mext/numeric/pchtom.rb
+- lib/mext/numeric/pchtooctsemi.rb
+- lib/mext/numeric/pchtosemi.rb
 - lib/mext/numeric/pitch_fork.rb
 - lib/mext/numeric/rrand.rb
+- lib/mext/numeric/semitopch.rb
 - lib/ruby-mext.rb
 - lib/ruby.rb
 - lib/ruby/extensions.rb