spcore 0.1.8 → 0.1.9

data/ChangeLog.rdoc

@@ -43,4 +43,9 @@ Require all sample rate args to be Fixnum.
 
 === 0.1.8 / 2013-05-03
 
-Add Envelope and Extrema classes, for signal analysis.
+Add Envelope and Extrema classes, for signal analysis.
+
+=== 0.1.9 / 2013-05-06
+
+Add TukeyWindow.
+Add Signal#keep_frequences, Signal#remove_frequencies, and Plotter#plot_signals.

data/README.rdoc

@@ -13,7 +13,7 @@ A library of signal processing methods and classes.
 * Resampling (discrete up, down and up/down, polynomial up, and hybrid up/down)
 * FFT transform (forward and inverse)
 * DFT transform (forward and inverse)
-* Windows (Blackman, Hamming, etc.)
+* Windows (Blackman, Hamming, and many more...)
 * Windowed sinc filter for lowpass and highpass.
 * Dual windowed sinc filter for bandpass and bandstop.
 * Interpolation (linear and polynomial)

data/lib/spcore.rb

@@ -5,9 +5,6 @@ require 'spcore/core/circular_buffer'
 require 'spcore/core/constants'
 require 'spcore/core/delay_line'
 require 'spcore/core/oscillator'
-require 'spcore/core/signal'
-require 'spcore/core/extrema'
-require 'spcore/core/envelope'
 
 require 'spcore/windows/bartlett_hann_window'
 require 'spcore/windows/bartlett_window'
@@ -23,6 +20,7 @@ require 'spcore/windows/lanczos_window'
 require 'spcore/windows/nuttall_window'
 require 'spcore/windows/rectangular_window'
 require 'spcore/windows/triangular_window'
+require 'spcore/windows/tukey_window'
 
 require 'spcore/filters/fir/fir'
 require 'spcore/filters/fir/sinc_filter'
@@ -43,6 +41,10 @@ require 'spcore/resampling/discrete_resampling'
 require 'spcore/resampling/polynomial_resampling'
 require 'spcore/resampling/hybrid_resampling'
 
+require 'spcore/analysis/extrema'
+require 'spcore/analysis/envelope'
+require 'spcore/analysis/signal'
+
 require 'spcore/util/gain'
 require 'spcore/util/limiters'
 require 'spcore/util/plotter'

data/lib/spcore/{core → analysis}/envelope.rb

@@ -4,7 +4,7 @@ module SPCore
 # sample-by-sample. As a result, it provides the envelope as an entire signal.
 #
 # @author James Tunnell
-class Envelope < Signal
+class Envelope
   
   attr_reader :data
   

data/lib/spcore/{core → analysis}/signal.rb

@@ -54,57 +54,98 @@ class Signal
   end
   
   # Increase the sample rate of signal data by the given factor using
-  # discrete upsampling method.
+  # discrete upsampling method. Modifies current object.
   # @param [Fixnum] upsample_factor Increase the sample rate by this factor.
   # @param [Fixnum] filter_order The filter order for the discrete lowpass filter.
-  def upsample_discrete upsample_factor, filter_order
+  def upsample_discrete! upsample_factor, filter_order
     @data = DiscreteResampling.upsample @data, @sample_rate, upsample_factor, filter_order
     @sample_rate *= upsample_factor
     return self
   end
 
+  # Increase the sample rate of signal data by the given factor using
+  # discrete upsampling method. Return result in a new Signal object.
+  # @param [Fixnum] upsample_factor Increase the sample rate by this factor.
+  # @param [Fixnum] filter_order The filter order for the discrete lowpass filter.
+  def upsample_discrete upsample_factor, filter_order
+    return self.clone.upsample_discrete!(upsample_factor, filter_order)
+  end
+
   # Decrease the sample rate of signal data by the given factor using
-  # discrete downsampling method.
+  # discrete downsampling method. Modifies current object.
   # @param [Fixnum] downsample_factor Decrease the sample rate by this factor.
   # @param [Fixnum] filter_order The filter order for the discrete lowpass filter.
-  def downsample_discrete downsample_factor, filter_order
+  def downsample_discrete! downsample_factor, filter_order
     @data = DiscreteResampling.downsample @data, @sample_rate, downsample_factor, filter_order
     @sample_rate /= downsample_factor
     return self
   end
 
+  # Decrease the sample rate of signal data by the given factor using
+  # discrete downsampling method. Return result in a new Signal object.
+  # @param [Fixnum] downsample_factor Decrease the sample rate by this factor.
+  # @param [Fixnum] filter_order The filter order for the discrete lowpass filter.
+  def downsample_discrete downsample_factor, filter_order
+    return self.clone.downsample_discrete!(downsample_factor, filter_order)
+  end
+
   # Change the sample rate of signal data by the given up/down factors, using
-  # discrete upsampling and downsampling methods.
+  # discrete upsampling and downsampling methods. Modifies current object.
   # @param [Fixnum] upsample_factor Increase the sample rate by this factor.
   # @param [Fixnum] downsample_factor Decrease the sample rate by this factor.
   # @param [Fixnum] filter_order The filter order for the discrete lowpass filter.
-  def resample_discrete upsample_factor, downsample_factor, filter_order
+  def resample_discrete! upsample_factor, downsample_factor, filter_order
     @data = DiscreteResampling.resample @data, @sample_rate, upsample_factor, downsample_factor, filter_order
     @sample_rate *= upsample_factor
     @sample_rate /= downsample_factor
     return self
   end
+
+  # Change the sample rate of signal data by the given up/down factors, using
+  # discrete upsampling and downsampling methods. Return result in a new Signal object.
+  # @param [Fixnum] upsample_factor Increase the sample rate by this factor.
+  # @param [Fixnum] downsample_factor Decrease the sample rate by this factor.
+  # @param [Fixnum] filter_order The filter order for the discrete lowpass filter.
+  def resample_discrete upsample_factor, downsample_factor, filter_order
+    return self.clone.resample_discrete!(upsample_factor, downsample_factor, filter_order)
+  end
   
   # Increase the sample rate of signal data by the given factor using
-  # polynomial interpolation.
+  # polynomial interpolation. Modifies current Signal object.
   # @param [Fixnum] upsample_factor Increase the sample rate by this factor.
-  def upsample_polynomial upsample_factor
+  def upsample_polynomial! upsample_factor
     @data = PolynomialResampling.upsample @data, upsample_factor
     @sample_rate *= upsample_factor
     return self
   end
 
+  # Increase the sample rate of signal data by the given factor using
+  # polynomial interpolation. Returns result as a new Signal object.
+  # @param [Fixnum] upsample_factor Increase the sample rate by this factor.
+  def upsample_polynomial upsample_factor
+    return self.clone.upsample_polynomial!(upsample_factor)
+  end
+  
   # Change the sample rate of signal data by the given up/down factors, using
-  # polynomial upsampling and discrete downsampling.
+  # polynomial upsampling and discrete downsampling. Modifies current Signal object.
   # @param [Fixnum] upsample_factor Increase the sample rate by this factor.
   # @param [Fixnum] downsample_factor Decrease the sample rate by this factor.
   # @param [Fixnum] filter_order The filter order for the discrete lowpass filter.
-  def resample_hybrid upsample_factor, downsample_factor, filter_order
+  def resample_hybrid! upsample_factor, downsample_factor, filter_order
     @data = HybridResampling.resample @data, @sample_rate, upsample_factor, downsample_factor, filter_order
     @sample_rate *= upsample_factor
     @sample_rate /= downsample_factor
     return self
   end
+
+  # Change the sample rate of signal data by the given up/down factors, using
+  # polynomial upsampling and discrete downsampling. Return result as a new Signal object.
+  # @param [Fixnum] upsample_factor Increase the sample rate by this factor.
+  # @param [Fixnum] downsample_factor Decrease the sample rate by this factor.
+  # @param [Fixnum] filter_order The filter order for the discrete lowpass filter.
+  def resample_hybrid upsample_factor, downsample_factor, filter_order
+    return self.clone.resample_hybrid!(upsample_factor, downsample_factor, filter_order)
+  end
   
   # Run FFT on signal data to find magnitude of frequency components.
   # @param convert_to_db If true, magnitudes are converted to dB values.
@@ -134,10 +175,27 @@ class Signal
     return @data.inject(0.0){|sum,x| sum + (x * x)}
   end
   
-  # Determine the envelope of the current Signal and return the resulting data
-  # in a new Signal object.
-  def envelope
-    return Envelope.new(@data)
+  # Calculate signal RMS (root-mean square), also known as quadratic mean, a
+  # statistical measure of the magnitude.
+  def rms
+    Math.sqrt(energy / size)
+  end
+  
+  # Find extrema (maxima, minima) within signal data.
+  def extrema
+    return Extrema.new(@data)
+  end
+  
+  # Determine the envelope of the current Signal and return either a Envelope
+  # or a new Signal object as a result.
+  # @param [True/False] make_signal If true, return envelope data in a new
+  #                     Otherwise, return an Envelope object.
+  def envelope make_signal = false
+    if make_signal
+      return Signal.new(:sample_rate => @sample_rate, :data => Envelope.new(@data).data)
+    else
+      return Envelope.new(@data)
+    end
   end
   
   # Add data in array or other signal to the beginning of current data.
@@ -150,6 +208,11 @@ class Signal
     return self
   end
 
+  # Add data in array or other signal to the beginning of current data.
+  def prepend other
+    clone.prepend! other
+  end
+  
   # Add data in array or other signal to the end of current data.
   def append! other
     if other.is_a?(Array)
@@ -159,6 +222,11 @@ class Signal
     end
     return self
   end
+
+  # Add data in array or other signal to the end of current data.
+  def append other
+    clone.append! other
+  end
   
   # Add value, values in array, or values in other signal to the current
   # data values, and update the current data with the results.
@@ -188,26 +256,7 @@ class Signal
   # data values, and return a new Signal object with the results.
   # @param other Can be Numeric (add same value to all data values), Array, or Signal.
   def add(other)
-    new_data = Array.new(@data.size)
-    
-    if other.is_a?(Numeric)
-      @data.each_index do |i|
-        new_data[i] = @data[i] + other
-      end
-    elsif other.is_a?(Signal)
-      raise ArgumentError, "other.data.size #{other.size} is not equal to data.size #{@data.size}" if other.data.size != @data.size
-      @data.each_index do |i|
-        new_data[i] = @data[i] + other.data[i]
-      end
-    elsif other.is_a?(Array)
-      raise ArgumentError, "other.size #{other.size} is not equal to data.size #{@data.size}" if other.size != @data.size
-      @data.each_index do |i|
-        new_data[i] = @data[i] + other[i]
-      end
-    else
-      raise ArgumentError, "other is not a Numeric, Signal, or Array"
-    end
-    return Signal.new(:data => new_data, :sample_rate => @sample_rate)
+    clone.add! other
   end
   
   # Subtract value, values in array, or values in other signal from the current
@@ -238,26 +287,7 @@ class Signal
   # data values, and return a new Signal object with the results.
   # @param other Can be Numeric (subtract same value from all data values), Array, or Signal.
   def subtract(other)
-    new_data = Array.new(@data.size)
-    
-    if other.is_a?(Numeric)
-      @data.each_index do |i|
-        new_data[i] = @data[i] - other
-      end
-    elsif other.is_a?(Signal)
-      raise ArgumentError, "other.data.size #{other.size} is not equal to data.size #{@data.size}" if other.data.size != @data.size
-      @data.each_index do |i|
-        new_data[i] = @data[i] - other.data[i]
-      end
-    elsif other.is_a?(Array)
-      raise ArgumentError, "other.size #{other.size} is not equal to data.size #{@data.size}" if other.size != @data.size
-      @data.each_index do |i|
-        new_data[i] = @data[i] - other[i]
-      end
-    else
-      raise ArgumentError, "other is not a Numeric, Signal, or Array"
-    end
-    return Signal.new(:data => new_data, :sample_rate => @sample_rate)
+    clone.subtract! other
   end
   
   # Multiply value, values in array, or values in other signal with the current
@@ -290,26 +320,7 @@ class Signal
   # @param other Can be Numeric (multiply all data values by the same value),
   #              Array, or Signal.  
   def multiply(other)
-    new_data = Array.new(@data.size)
-    
-    if other.is_a?(Numeric)
-      @data.each_index do |i|
-        new_data[i] = @data[i] * other
-      end
-    elsif other.is_a?(Signal)
-      raise ArgumentError, "other.data.size #{other.size} is not equal to data.size #{@data.size}" if other.data.size != @data.size
-      @data.each_index do |i|
-        new_data[i] = @data[i] * other.data[i]
-      end
-    elsif other.is_a?(Array)
-      raise ArgumentError, "other.size #{other.size} is not equal to data.size #{@data.size}" if other.size != @data.size
-      @data.each_index do |i|
-        new_data[i] = @data[i] * other[i]
-      end
-    else
-      raise ArgumentError, "other is not a Numeric, Signal, or Array"
-    end
-    return Signal.new(:data => new_data, :sample_rate => @sample_rate)
+    clone.multiply! other
   end
   
   # Divide value, values in array, or values in other signal into the current
@@ -342,26 +353,7 @@ class Signal
   # @param other Can be Numeric (divide same all data values by the same value),
   #              Array, or Signal.
   def divide(other)
-    new_data = Array.new(@data.size)
-    
-    if other.is_a?(Numeric)
-      @data.each_index do |i|
-        new_data[i] = @data[i] / other
-      end
-    elsif other.is_a?(Signal)
-      raise ArgumentError, "other.data.size #{other.size} is not equal to data.size #{@data.size}" if other.data.size != @data.size
-      @data.each_index do |i|
-        new_data[i] = @data[i] / other.data[i]
-      end
-    elsif other.is_a?(Array)
-      raise ArgumentError, "other.size #{other.size} is not equal to data.size #{@data.size}" if other.size != @data.size
-      @data.each_index do |i|
-        new_data[i] = @data[i] / other[i]
-      end
-    else
-      raise ArgumentError, "other is not a Numeric, Signal, or Array"
-    end
-    return Signal.new(:data => new_data, :sample_rate => @sample_rate)
+    clone.divide! other
   end
 
   alias_method :+, :add
@@ -446,6 +438,97 @@ class Signal
     
     return cross_correlation
   end  
-end
 
+  # Removes all but the given range of frequencies from the signal, using
+  # frequency domain filtering. Modifes and returns the current object.
+  def remove_frequencies! freq_range
+    modify_freq_content freq_range, :remove
+  end
+  
+  # Removes the given range of frequencies from the signal, using
+  # frequency domain filtering. Modifes a clone of the current object,
+  # returning the clone.
+  def remove_frequencies freq_range
+    return self.clone.remove_frequencies!(freq_range)
+  end
+  
+  # Removes all but the given range of frequencies from the signal, using
+  # frequency domain filtering. Modifes and returns the current object.
+  def keep_frequencies! freq_range
+    modify_freq_content freq_range, :keep
+  end
+
+  # Removes all but the given range of frequencies from the signal, using
+  # frequency domain filtering. Modifes a clone of the current object,
+  # returning the clone.
+  def keep_frequencies freq_range
+    return self.clone.keep_frequencies!(freq_range)
+  end
+  
+  private
+  
+  def modify_freq_content freq_range, mod_type
+    nyquist = @sample_rate / 2
+    
+    unless freq_range.min.between?(0, nyquist)
+      raise ArgumentError, "freq_range.min #{freq_range.min} is not between 0 and #{nyquist}"
+    end
+
+    unless freq_range.max.between?(0, nyquist)
+      raise ArgumentError, "freq_range.min #{freq_range.min} is not between 0 and #{nyquist}"
+    end
+    
+    power_of_two = FFT.power_of_two?(size)
+    if power_of_two
+      freq_domain = FFT.forward @data
+    else
+      freq_domain = DFT.forward @data
+    end
+    
+    # cutoff indices for real half
+    a = ((freq_range.min * size) / @sample_rate).round
+    b = ((freq_range.max * size) / @sample_rate).round
+    
+    window_size = b - a + 1
+    window_data = RectangularWindow.new(window_size).data
+        
+    case mod_type
+    when :keep
+      new_freq_data = Array.new(size, Complex(0))
+      
+      window_size.times do |n|
+        i = n + a
+        new_freq_data[i] = freq_domain[i] * window_data[n]
+      end
+
+      window_size.times do |n|
+        i = n + (size - 1 - b)
+        new_freq_data[i] = freq_domain[i] * window_data[n]
+      end
+    when :remove
+      new_freq_data = freq_domain.clone
+      
+      window_size.times do |n|
+        i = n + a
+        new_freq_data[i] = freq_domain[i] * (Complex(1.0) - window_data[n])
+      end
+
+      window_size.times do |n|
+        i = n + (size - 1 - b)
+        new_freq_data[i] = freq_domain[i] * (Complex(1.0) - window_data[n])
+      end
+    else
+      raise ArgumentError, "unkown mod_type #{mod_type}"
+    end
+    
+    if power_of_two
+      data = FFT.inverse new_freq_data
+    else
+      data = DFT.inverse new_freq_data
+    end
+    
+    @data = data.map {|complex| complex.real }
+    return self
+  end
+end
 end

data/lib/spcore/transforms/fft.rb

@@ -3,6 +3,11 @@ module SPCore
 # @author James Tunnell
 class FFT
 
+  def self.power_of_two? size
+    log2size = Math::log2(size)
+    return log2size.floor == log2size
+  end
+  
   # Forward Radix-2 FFT transform using decimation-in-time. Operates on an array
   # of real values, representing a time domain signal.
   # Ported from unlicensed MATLAB code which was posted to the MathWorks file

data/lib/spcore/util/plotter.rb

@@ -98,5 +98,13 @@ class Plotter
       end
     end
   end
+  
+  def plot_signals signals_hash
+    data_hash = {}
+    signals_hash.each do |name, signal|
+      data_hash[name] = signal.data
+    end
+    plot_1d data_hash
+  end
 end
 end

data/lib/spcore/version.rb

@@ -1,5 +1,5 @@
 # A library of signal processing methods and classes.
 module SPCore
   # spcore version
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/spcore/windows/tukey_window.rb

@@ -0,0 +1,32 @@
+module SPCore
+# Produces a Tukey window of a given size (number of samples).
+# The Tukey window, also known as tapered cosine, can be regarded as a cosine
+# lobe of width alpha * N / 2 that is convolved with a rectangular window. At
+# alpha = 0 it becomes rectangular, and at alpha = 1 it becomes a Hann window.
+# For more info, see https://en.wikipedia.org/wiki/Window_function#Tukey_window.
+class TukeyWindow
+  attr_reader :data
+  def initialize size, alpha = 0.5
+    @data = Array.new(size)
+    
+    left = (alpha * (size - 1) / 2.0).to_i
+    right = ((size - 1) * (1.0 - (alpha / 2.0))).to_i
+    
+    size_min_1 = size - 1
+    
+    for n in 0...left
+      x = Math::PI * (((2.0 * n) / (alpha * size_min_1)) - 1.0)
+      @data[n] = 0.5 * (1.0 + Math::cos(x))
+    end
+    
+    for n in left..right
+      @data[n] = 1.0
+    end
+    
+    for n in (right + 1)...size
+      x = Math::PI * (((2 * n) / (alpha * size_min_1)) - (2.0 / alpha) + 1.0)
+      @data[n] = 0.5 * (1.0 + Math::cos(x))
+    end
+  end
+end
+end

data/spec/analysis/envelope_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe SPCore::Envelope do
+  it 'should produce an output that follows the amplitude of the input' do
+    sample_rate = 1000
+    sample_count = 512
+    generator = SignalGenerator.new(:size => sample_count, :sample_rate => sample_rate)
+    
+    modulation_signal = generator.make_signal [4.0]
+    modulation_signal.multiply! BlackmanWindow.new(sample_count).data
+
+    base_signal = generator.make_signal [64.0]
+    base_signal.multiply! modulation_signal
+    
+    envelope = base_signal.envelope(true)
+    
+    #signals = {
+    #  "signal" => base_signal,
+    #  "modulation" => modulation_signal,
+    #  "envelope" => envelope,
+    #}
+    #
+    #Plotter.new(
+    #  :title => "signal and envelope",
+    #  :xlabel => "sample",
+    #  :ylabel => "values",
+    #).plot_signals(signals)
+    
+    begin
+      ideal = modulation_signal.energy
+      actual = envelope.energy
+      error = (ideal - actual).abs / ideal
+      error.should be_within(0.1).of(0.0)
+    end
+    
+    begin
+      ideal = modulation_signal.rms
+      actual = envelope.rms
+      error = (ideal - actual).abs / ideal
+      error.should be_within(0.1).of(0.0)
+    end
+  end
+end

data/spec/analysis/signal_spec.rb

@@ -0,0 +1,68 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe SPCore::Signal do
+  describe '#remove_frequencies' do
+    before :each do
+      generator = SignalGenerator.new(:sample_rate => 2000, :size => 256)
+      @original = generator.make_signal([40.0, 160.0])
+      @ideal_modified = generator.make_signal([160.0])
+    end
+    
+    it 'should produce the expected modified signal (with almost identical energy and RMS)' do
+      modified = @original.remove_frequencies(0.0..80.0)
+      
+      begin
+        actual = modified.energy
+        ideal = @ideal_modified.energy
+        error = (actual - ideal).abs / ideal
+        error.should be_within(0.05).of(0.0)
+      end
+
+      begin
+        actual = modified.rms
+        ideal = @ideal_modified.rms
+        error = (actual - ideal).abs / ideal
+        error.should be_within(0.05).of(0.0)
+      end
+      
+      #Plotter.new().plot_signals(
+      #  #"original" => @original,
+      #  "ideal modified" => @ideal_modified,
+      #  "actual modified" => modified
+      #)
+    end
+  end
+
+  describe '#keep_frequencies' do
+    before :each do
+      generator = SignalGenerator.new(:sample_rate => 2000, :size => 256)
+      @original = generator.make_signal([40.0, 160.0])
+      @ideal_modified = generator.make_signal([160.0])
+    end
+    
+    it 'should produce the expected modified signal (with almost identical energy and RMS)' do
+      modified = @original.keep_frequencies(80.0..240.0)
+      
+      begin
+        actual = modified.energy
+        ideal = @ideal_modified.energy
+        error = (actual - ideal).abs / ideal
+        error.should be_within(0.05).of(0.0)
+      end
+
+      begin
+        actual = modified.rms
+        ideal = @ideal_modified.rms
+        error = (actual - ideal).abs / ideal
+        error.should be_within(0.05).of(0.0)
+      end
+      
+      #Plotter.new().plot_signals(
+      #  #"original" => @original,
+      #  "ideal modified" => @ideal_modified,
+      #  "actual modified" => modified
+      #)
+    end
+  end
+
+end

data/spec/windows/window_spec.rb

@@ -5,20 +5,21 @@ describe 'windows' do
     size = 512
     
     window_classes = [
-      #SPCore::RectangularWindow,
-      #SPCore::HannWindow,
-      #SPCore::HammingWindow,
-      #SPCore::CosineWindow,
-      #SPCore::LanczosWindow,
-      #SPCore::TriangularWindow,
-      #SPCore::BartlettWindow,
-      #SPCore::GaussianWindow,
-      #SPCore::BartlettHannWindow,
-      #SPCore::BlackmanWindow,
-      #SPCore::NuttallWindow,
-      #SPCore::BlackmanHarrisWindow,
-      #SPCore::BlackmanNuttallWindow,
-      #SPCore::FlatTopWindow
+      #RectangularWindow,
+      #HannWindow,
+      #HammingWindow,
+      #CosineWindow,
+      #LanczosWindow,
+      #TriangularWindow,
+      #BartlettWindow,
+      #GaussianWindow,
+      #BartlettHannWindow,
+      #BlackmanWindow,
+      #NuttallWindow,
+      #BlackmanHarrisWindow,
+      #BlackmanNuttallWindow,
+      #FlatTopWindow,
+      #TukeyWindow
     ]
     
     windows = {}
@@ -27,7 +28,7 @@ describe 'windows' do
     end
     
     if windows.any?
-      Plotter.new(:title => "windows").plot_1d windows
+      Plotter.new(:title => "windows").plot_1d(windows, true)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spcore
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashmake
@@ -144,13 +144,13 @@ files:
 - README.rdoc
 - Rakefile
 - lib/spcore.rb
+- lib/spcore/analysis/envelope.rb
+- lib/spcore/analysis/extrema.rb
+- lib/spcore/analysis/signal.rb
 - lib/spcore/core/circular_buffer.rb
 - lib/spcore/core/constants.rb
 - lib/spcore/core/delay_line.rb
-- lib/spcore/core/envelope.rb
-- lib/spcore/core/extrema.rb
 - lib/spcore/core/oscillator.rb
-- lib/spcore/core/signal.rb
 - lib/spcore/filters/fir/dual_sinc_filter.rb
 - lib/spcore/filters/fir/fir.rb
 - lib/spcore/filters/fir/sinc_filter.rb
@@ -188,11 +188,13 @@ files:
 - lib/spcore/windows/nuttall_window.rb
 - lib/spcore/windows/rectangular_window.rb
 - lib/spcore/windows/triangular_window.rb
+- lib/spcore/windows/tukey_window.rb
 - spcore.gemspec
+- spec/analysis/envelope_spec.rb
+- spec/analysis/extrema_spec.rb
+- spec/analysis/signal_spec.rb
 - spec/core/circular_buffer_spec.rb
 - spec/core/delay_line_spec.rb
-- spec/core/envelope_spec.rb
-- spec/core/extrema_spec.rb
 - spec/core/oscillator_spec.rb
 - spec/filters/fir/dual_sinc_filter_spec.rb
 - spec/filters/fir/sinc_filter_spec.rb
@@ -226,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1351761362878137001
+      hash: -94862182169118755
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -235,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1351761362878137001
+      hash: -94862182169118755
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -243,10 +245,11 @@ signing_key:
 specification_version: 3
 summary: A library of signal processing methods and classes.
 test_files:
+- spec/analysis/envelope_spec.rb
+- spec/analysis/extrema_spec.rb
+- spec/analysis/signal_spec.rb
 - spec/core/circular_buffer_spec.rb
 - spec/core/delay_line_spec.rb
-- spec/core/envelope_spec.rb
-- spec/core/extrema_spec.rb
 - spec/core/oscillator_spec.rb
 - spec/filters/fir/dual_sinc_filter_spec.rb
 - spec/filters/fir/sinc_filter_spec.rb

data/spec/core/envelope_spec.rb

@@ -1,29 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe SPCore::Envelope do
-  it 'should produce an output that follows the amplitude of the input' do
-    sample_rate = 400
-    sample_count = sample_rate
-    generator = SignalGenerator.new(:size => sample_count, :sample_rate => sample_rate)
-    base_signal = generator.make_signal [sample_rate / 5.0]    
-    modulation_signal = generator.make_signal [sample_rate / 80.0]
-    base_signal.multiply! modulation_signal
-    
-    envelope = base_signal.envelope
-    
-    Plotter.new(
-      :title => "signal and envelope",
-      :xlabel => "sample",
-      :ylabel => "values",
-    ).plot_1d(
-      "signal" => base_signal.data,
-      "modulation" => modulation_signal.data,
-      "envelope" => envelope.data,
-    )
-    
-    max_diff = 0.1
-    sample_count.times do |n|
-      envelope.data[n].should be_within(max_diff).of(modulation_signal.data[n].abs)
-    end
-  end
-end