noyes 0.3.2 → 0.4.0

data/lib/common/noyes_dsl.rb

@@ -4,3 +4,49 @@ class Array
     other << self
   end
 end
+
+# This portion is still highly experimental.  It allows filters to be combined
+# in complicated ways using a syntax similar to Backus Naur Form.  
+module NoyesFilterDSL
+  def + other
+    other_filters = other.kind_of?(SerialFilter) ? other.filters.clone : other
+    SerialFilter.new [self, other].flatten
+  end
+  def | other
+     other_filters = other.kind_of?(ParallelFilter) ? other.filtes.clone : other
+     ParallelFilter.new [self, other].flatten
+  end
+end
+
+module Noyes
+  class DCT
+    include NoyesFilterDSL
+  end
+  class DoubleDeltaFilter
+    include NoyesFilterDSL
+  end
+  class Filter
+    include NoyesFilterDSL
+  end
+  class HammingWindow
+    include NoyesFilterDSL
+  end
+  class LiveCMN
+    include NoyesFilterDSL
+  end
+  class LogCompressor
+    include NoyesFilterDSL
+  end
+  class MelFilter
+    include NoyesFilterDSL
+  end
+  class PowerSpectrumFilter
+    include NoyesFilterDSL
+  end
+  class Preemphasizer
+    include NoyesFilterDSL
+  end
+  class Segmenter
+    include NoyesFilterDSL
+  end
+end

data/lib/common/parallel_filter.rb

@@ -0,0 +1,36 @@
+module NoyesFilterDSL
+  class ParallelFilter
+    attr_reader :filters
+    def initialize filters=[]
+      @filters = filters.kind_of?(Array) ? filters : [filters]
+    end
+    def << data
+      if data.size != @filters.size
+        raise "data (%d) and filters (%d) must have same dimensions." %
+          [data.size, @filters.size]
+      end
+      offset = -1
+      @filters.map {|f| f << data[offset+=1]}
+    end
+    def + other
+      raise "Parameter does not respond to <<." unless other.respond_to? :<<
+      if other.kind_of?(ParallelFilter) && filters.size != other.filters.size
+        raise "Parallel filters must have equal dimensions %d vs %d " %
+          [filters.size, other.filters.size]
+      end
+      other_filters = if other.kind_of? SerialFilter
+        other.filters.clone
+      else
+        other
+      end
+      SerialFilter.new([ParallelFilter.new(filters.clone),  other_filters].flatten)
+    end
+    def | other
+      raise "Parameter does not respond to <<." unless other.respond_to? :<<
+      if other.kind_of? ParallelFilter
+        return ParallelFilter.new(@filters + other.filters)
+      end
+      ParallelFilter.new((@filters + other).flatten)
+    end
+  end
+end

data/lib/common/serial_filter.rb

@@ -0,0 +1,30 @@
+module NoyesFilterDSL
+  class SerialFilter
+    attr_reader :filters
+    def initialize filters = []
+      @filters = filters.kind_of?(Array) ? filters : [filters]
+    end
+    def << data
+      @filters.each {|f| data >>= f}
+      data
+    end
+    def + other
+      raise "Parameter does not respond to <<." unless other.respond_to? :<<
+      if other.kind_of? SerialFilter
+        return SerialFilter.new(@filters.clone + other.filters.clone)
+      end
+      SerialFilter.new((@filters + [other]).flatten)
+    end
+    def | other
+      raise "Parameter does not respond to <<." unless other.respond_to? :<<
+      other_filters = if other.kind_of? Array
+        SerialFilter.new other 
+      elsif other.kind_of? ParallelFilter
+        other_filters = other.filters
+      else
+        other
+      end
+      ParallelFilter.new([SerialFilter.new(filters), other_filters])
+    end
+  end
+end

data/lib/noyes.rb

@@ -1,13 +1,15 @@
-require "noyes_dsl"
-require "noyes_math"
-require "live_cmn"
-require "dct"
-require "delta"
-require "filter"
-require "mel_filter"
-require "hamming_window"
-require "log_compress"
-require "discrete_fourier_transform"
-require "power_spec"
-require "preemphasis"
-require "segment"
+require 'serial_filter'
+require 'parallel_filter'
+require 'noyes_dsl'
+require 'noyes_math'
+require 'live_cmn'
+require 'dct'
+require 'delta'
+require 'filter'
+require 'mel_filter'
+require 'hamming_window'
+require 'log_compress'
+require 'discrete_fourier_transform'
+require 'power_spec'
+require 'preemphasis'
+require 'segment'

data/lib/ruby_impl/delta.rb

@@ -10,15 +10,11 @@ module Noyes
       buf = @previous + cepstra
       result = []
       for i in 3...(buf.size-3)
-         delta = Array.new buf[i].size
-         delta.size.times do |k|
-           delta[k] = buf[i+2][k] - buf[i-2][k]
-         end
-         double_delta = Array.new buf[i].size
-         double_delta.size.times do |k|
-           double_delta[k] = buf[i+3][k] - buf[i-1][k] - buf[i+1][k] + buf[i-3][k]
-         end
-         result << [buf[i], delta, double_delta]
+        delta = Array.new(buf[i].size) {|k| buf[i+2][k] - buf[i-2][k]}
+        double_delta = Array.new(buf[i].size) do |k|
+          buf[i+3][k] - buf[i-1][k] - buf[i+1][k] + buf[i-3][k]
+        end
+        result << [buf[i], delta, double_delta]
       end
       @previous = buf[-6..-1]
       result

data/lib/ruby_impl/discrete_fourier_transform.rb

@@ -4,10 +4,7 @@ module Noyes
   include Math
   # Takes the discrete Fourier transform.
   def dft data,size
-  	vals = Array.new size
-  	data.size.times {|i| vals[i] = Complex(data[i],0)}
-  	(data.size).upto(size-1) {|i| vals[i] = Complex(0,0)}
-  
+    vals = Array.new(size) {|i| i < data.size ? Complex(data[i],0) : Complex(0,0)}
   	j=0
   	size.times do |i|
   		vals[j],vals[i] = vals[i],vals[j] if i<j

data/lib/ruby_impl/live_cmn.rb

@@ -1,42 +1,44 @@
-class LiveCMN
-  # Normalizes cepstrum means and applies them.  Dimensionality remains
-  # unchanged.  NOTE:  This class resets itself automatically if bounds drift
-  # too much.  Possibly these bounds should be parameterized.
-  def initialize dimensions=13, init_mean=45.0, window_size=100, shift=160
-    @init_mean = init_mean; @shift = shift; @ws = window_size
-    @sums = Array.new dimensions, 0
-    @means = Array.new dimensions, 0
-    @means[0] = @init_mean
-    @frame_count = 0
-  end
-  def << dct
-    raise "Wrong number of dimensions" if dct[0].size != @means.size
-    dct.map do |mfc|
-      cmn = Array.new @means.size
-      @means.size.times do |i|
-        @sums[i] += mfc[i]
-        cmn[i] = mfc[i] - @means[i]
+module Noyes
+  class LiveCMN
+    # Normalizes cepstrum means and applies them.  Dimensionality remains
+    # unchanged.  NOTE:  This class resets itself automatically if bounds drift
+    # too much.  Possibly these bounds should be parameterized.
+    def initialize dimensions=13, init_mean=45.0, window_size=100, shift=160
+      @init_mean = init_mean; @shift = shift; @ws = window_size
+      @sums = Array.new dimensions, 0
+      @means = Array.new dimensions, 0
+      @means[0] = @init_mean
+      @frame_count = 0
+    end
+    def << dct
+      raise "Wrong number of dimensions" if dct[0].size != @means.size
+      dct.map do |mfc|
+        cmn = Array.new @means.size
+        @means.size.times do |i|
+          @sums[i] += mfc[i]
+          cmn[i] = mfc[i] - @means[i]
+        end
+        @frame_count += 1
+        update if @frame_count > @shift
+        cmn
       end
-      @frame_count += 1
-      update if @frame_count > @shift
-      cmn
     end
-  end
-  def update
-    per_frame = 1.0 / @frame_count
-    @means = @sums.map {|x| x * per_frame}
-    
-    if @means.first > 70 || @means.first < 5
-      reset
-    elsif @frame_count >= @shift
-      @sums = @sums.map {|x| x * per_frame * @ws}
-      @frame_count = @ws
+    def update
+      per_frame = 1.0 / @frame_count
+      @means = @sums.map {|x| x * per_frame}
+      
+      if @means.first > 70 || @means.first < 5
+        reset
+      elsif @frame_count >= @shift
+        @sums = @sums.map {|x| x * per_frame * @ws}
+        @frame_count = @ws
+      end
+    end
+    def reset
+      @sums.map! {0}
+      @means.map! {0}
+      @means[0] = @init_mean
+      @frame_count = 0
     end
-  end
-  def reset
-    @sums.map! {0}
-    @means.map! {0}
-    @means[0] = @init_mean
-    @frame_count = 0
   end
 end

data/lib/ruby_impl/segment.rb

@@ -6,7 +6,6 @@ module Noyes
       @winsz = window_size; @winshift = shift
       @overflow = nil
     end    
-  
     def << data
       data = @overflow + data if @overflow
       if data.size < @winsz + @winshift * 5
@@ -15,14 +14,14 @@ module Noyes
       else
         @overflow = nil 
       end
-      x = []
-      i = 0
-      while i+@winsz <= data.length
-        x << data[i,@winsz]
-        i += @winshift
+      segments = []
+      offset = 0
+      while offset + @winsz <= data.length
+        segments << data[offset, @winsz]
+        offset += @winshift
       end
-      @overflow = data[i..-1]
-      x
+      @overflow = data[offset..-1]
+      segments
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: noyes
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Joe Woelfel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 -05:00
+date: 2010-02-02 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,9 @@ extra_rdoc_files:
 files: 
 - lib/common/noyes_dsl.rb
 - lib/common/noyes_math.rb
+- lib/common/parallel_filter.rb
 - lib/common/send_incrementally.rb
+- lib/common/serial_filter.rb
 - lib/noyes.rb
 - lib/ruby_impl/dct.rb
 - lib/ruby_impl/delta.rb