spcore 0.1.6 → 0.1.7

data/ChangeLog.rdoc

@@ -35,4 +35,8 @@ Adjust project documentation.
 
 === 0.1.6 / 2013-03-21
 
-Update to be compatible with hashmake-0.1.6.
+Update to be compatible with hashmake-0.1.6.
+
+=== 0.1.7  2013-04-18
+
+Require all sample rate args to be Fixnum.

data/lib/spcore/core/delay_line.rb

@@ -9,7 +9,7 @@ class DelayLine
 
   # Used to process hashed arguments in #initialize.
   ARG_SPECS = {
-    :sample_rate => arg_spec(:reqd => true, :type => Float, :validator => ->(a){ a > 0.0 } ),
+    :sample_rate => arg_spec(:reqd => true, :type => Fixnum, :validator => ->(a){ a > 0.0 } ),
     :max_delay_seconds => arg_spec(:reqd => true, :type => Float, :validator => ->(a){ (a > 0.0) } ),
     :delay_seconds => arg_spec(:reqd => false, :type => Float, :default => 0.0, :validator => ->(a){ a >= 0.0 } ),
   }

data/lib/spcore/core/envelope_detector.rb

@@ -7,7 +7,7 @@ class EnvelopeDetector
   
   # Used to process hashed arguments in #initialize.
   ARG_SPECS = {
-    :sample_rate => arg_spec(:reqd => true, :type => Float, :validator => ->(a){ a > 0.0 } ),
+    :sample_rate => arg_spec(:reqd => true, :type => Fixnum, :validator => ->(a){ a > 0.0 } ),
     :attack_time => arg_spec(:reqd => true, :type => Float, :validator => ->(a){ a > 0.0 } ),
     :release_time => arg_spec(:reqd => true, :type => Float, :validator => ->(a){ a > 0.0 } ),
   }

data/lib/spcore/core/oscillator.rb

@@ -22,12 +22,12 @@ class Oscillator
   
   # Used to process hashed arguments in #initialize.
   ARG_SPECS = {
-    :sample_rate => arg_spec(:reqd => true, :type => Float, :validator => ->(a){ a > 0.0 } ),
+    :sample_rate => arg_spec(:reqd => true, :type => Fixnum, :validator => ->(a){ a > 0 } ),
     :wave_type => arg_spec(:reqd => false, :type => Symbol, :default => WAVE_SINE, :validator => ->(a){ WAVES.include? a } ),
-    :frequency => arg_spec(:reqd => false, :type => Float, :default => 1.0, :validator => ->(a){ a > 0.0 } ),
-    :amplitude => arg_spec(:reqd => false, :type => Float, :default => 1.0 ),
-    :phase_offset => arg_spec(:reqd => false, :type => Float, :default => 0.0 ),
-    :dc_offset => arg_spec(:reqd => false, :type => Float, :default => 0.0 ),
+    :frequency => arg_spec(:reqd => false, :type => Numeric, :default => 1.0, :validator => ->(a){ a > 0.0 } ),
+    :amplitude => arg_spec(:reqd => false, :type => Numeric, :default => 1.0 ),
+    :phase_offset => arg_spec(:reqd => false, :type => Numeric, :default => 0.0 ),
+    :dc_offset => arg_spec(:reqd => false, :type => Numeric, :default => 0.0 ),
   }
   
   # A new instance of Oscillator. The controllable wave parameters are frequency,

data/lib/spcore/core/signal.rb

@@ -9,7 +9,7 @@ class Signal
   # Used to process hashed arguments in #initialize.
   ARG_SPECS = {
     :data => arg_spec(:reqd => true, :type => Array, :validator => ->(a){ a.any? }),
-    :sample_rate => arg_spec(:reqd => true, :type => Float, :validator => ->(a){ a > 0.0 })
+    :sample_rate => arg_spec(:reqd => true, :type => Fixnum, :validator => ->(a){ a > 0.0 })
   }
   
   attr_reader :data, :sample_rate

data/lib/spcore/filters/fir/dual_sinc_filter.rb

@@ -13,7 +13,7 @@ class DualSincFilter
   # Use to process hashed args in #initialize.
   ARG_SPECS = {
     :order => arg_spec(:reqd => true, :type => Fixnum, :validator => ->(a){ a % 2 == 0 } ),
-    :sample_rate => arg_spec(:reqd => true, :type => Numeric, :validator => ->(a){ a > 0.0 } ),
+    :sample_rate => arg_spec(:reqd => true, :type => Fixnum, :validator => ->(a){ a > 0.0 } ),
     :left_cutoff_freq => arg_spec(:reqd => true, :type => Numeric, :validator => ->(a){ a > 0.0 } ),
     :right_cutoff_freq => arg_spec(:reqd => true, :type => Numeric, :validator => ->(a){ a > 0.0 } ),
     :window_class => arg_spec(:reqd => false, :type => Class, :default => BlackmanWindow ),
@@ -26,8 +26,8 @@ class DualSincFilter
   def initialize args
     hash_make DualSincFilter::ARG_SPECS, args
     
-    raise ArgumentError, "left_cutoff_freq is greater than 0.5 * sample_rate" if @left_cutoff_freq > (@sample_rate / 2)
-    raise ArgumentError, "right_cutoff_freq is greater than 0.5 * sample_rate" if @right_cutoff_freq > (@sample_rate / 2)
+    raise ArgumentError, "left_cutoff_freq is greater than 0.5 * sample_rate" if @left_cutoff_freq > (@sample_rate * 0.5)
+    raise ArgumentError, "right_cutoff_freq is greater than 0.5 * sample_rate" if @right_cutoff_freq > (@sample_rate * 0.5)
     raise ArgumentError, "left_cutoff_freq is not less than right_cutoff_freq" unless @left_cutoff_freq < @right_cutoff_freq 
     
     @left_filter = SincFilter.new(
@@ -57,8 +57,8 @@ class DualSincFilter
       bandstop_kernel[size - 1 - n] = bandstop_kernel[n] = @left_filter.lowpass_fir.kernel[n] + @right_filter.highpass_fir.kernel[n]
     end
 
-    left_transition_freq = @left_cutoff_freq / @sample_rate
-    right_transition_freq = @right_cutoff_freq / @sample_rate
+    left_transition_freq = @left_cutoff_freq.to_f / @sample_rate
+    right_transition_freq = @right_cutoff_freq.to_f / @sample_rate
     bw_times_two = 2.0 * (right_transition_freq - left_transition_freq)
     window_center_val = window.data[@order / 2]
     

data/lib/spcore/filters/fir/fir.rb

@@ -60,7 +60,7 @@ class FIR
     
     response = {}
     output.each_index do |n|
-      frequency = (@sample_rate * n) / (output.size * 2)
+      frequency = (@sample_rate * n) / (output.size * 2.0)
       response[frequency] = output[n]
     end
     

data/lib/spcore/filters/fir/sinc_filter.rb

@@ -14,7 +14,7 @@ class SincFilter
   # Use to process hashed args in #initialize.  
   ARG_SPECS = {
     :order => arg_spec(:reqd => true, :type => Fixnum, :validator => ->(a){ a % 2 == 0 } ),
-    :sample_rate => arg_spec(:reqd => true, :type => Numeric, :validator => ->(a){ a > 0.0 } ),
+    :sample_rate => arg_spec(:reqd => true, :type => Fixnum, :validator => ->(a){ a > 0 } ),
     :cutoff_freq => arg_spec(:reqd => true, :type => Numeric, :validator => ->(a){ a > 0.0 } ),
     :window_class => arg_spec(:reqd => false, :type => Class, :default => BlackmanWindow ),
   }
@@ -26,10 +26,10 @@ class SincFilter
   def initialize args
     hash_make SincFilter::ARG_SPECS, args
     
-    raise ArgumentError, "cutoff_freq is greater than 0.5 * sample_rate" if @cutoff_freq > (@sample_rate / 2)
+    raise ArgumentError, "cutoff_freq is greater than 0.5 * sample_rate" if @cutoff_freq > (@sample_rate / 2.0)
     
     size = @order + 1
-    transition_freq = @cutoff_freq / @sample_rate
+    transition_freq = @cutoff_freq.to_f / @sample_rate
     b = TWO_PI * transition_freq
     
     # make FIR filter kernels for lowpass and highpass

data/lib/spcore/resampling/discrete_resampling.rb

@@ -17,7 +17,7 @@ class DiscreteResampling
     filter = SincFilter.new(
       :sample_rate => (sample_rate * upsample_factor),
       :order => filter_order,
-      :cutoff_freq => (sample_rate / 2),
+      :cutoff_freq => (sample_rate / 2.0),
       :window_class => NuttallWindow
     )
     
@@ -37,7 +37,7 @@ class DiscreteResampling
 
     filter = SincFilter.new(
       :sample_rate => sample_rate, :order => filter_order,
-      :cutoff_freq => ((sample_rate / downsample_factor) / 2.0),
+      :cutoff_freq => ((sample_rate.to_f / downsample_factor) / 2.0),
       :window_class => NuttallWindow
     )
     

data/lib/spcore/util/signal_generator.rb

@@ -6,7 +6,7 @@ class SignalGenerator
   # used to process hashed args in #initialize.
   ARG_SPECS = {
     :size => arg_spec(:reqd => true, :type => Fixnum, :validator => ->(a){ a > 0 }),
-    :sample_rate => arg_spec(:reqd => true, :type => Float, :validator => ->(a){ a > 0.0 })
+    :sample_rate => arg_spec(:reqd => true, :type => Fixnum, :validator => ->(a){ a > 0 })
   }
   
   attr_reader :sample_rate, :size

data/lib/spcore/version.rb

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

data/spec/core/delay_line_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe SPCore::DelayLine do
   it 'should' do
-    SAMPLE_RATE = 400.0
+    SAMPLE_RATE = 400
     MAX_DELAY_SEC = 0.1
     
     5.times do

data/spec/core/envelope_detector_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe SPCore::EnvelopeDetector do
   describe '#process_sample' do
     it 'should produce an output that follows the amplitude of the input' do
-      sample_rate = 400.0
+      sample_rate = 400
       freqs = [20.0, 60.0]
 
       envelope_start = 1.0

data/spec/core/oscillator_spec.rb

@@ -4,7 +4,7 @@ require 'pry'
 
 describe SPCore::Oscillator do
   #it 'should look like a ...' do
-  #  sample_rate = 44000.0
+  #  sample_rate = 44000
   #  test_freq = 100.0
   #  osc = SPCore::Oscillator.new :sample_rate => sample_rate, :frequency => test_freq, :wave_type => SPCore::Oscillator::WAVE_SQUARE
   #  N = (5 * sample_rate / test_freq).to_i
@@ -32,7 +32,7 @@ describe SPCore::Oscillator do
   #end
   
   before :each do
-    @sample_rate = 40000.0
+    @sample_rate = 40000
     @freqs = [ 20.0, 200.0, 400.0 ]
   end
   

data/spec/filters/fir/dual_sinc_filter_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe SPCore::SincFilter do
   before :all do
-    @sample_rate = 4000.0
+    @sample_rate = 4000
     @orders = [62]
     @left_cutoffs = Scale.exponential 300.0..1500.0, 3
     @right_cutoffs = Scale.exponential 400.0..1600.0, 3

data/spec/filters/fir/sinc_filter_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe SPCore::SincFilter do
   before :all do
-    @sample_rate = 4000.0
+    @sample_rate = 4000
     @orders = [62]
     @cutoffs = Scale.exponential 400.0..1600.0, 3
   end

data/spec/filters/iir/cookbook_filter_spec.rb

@@ -4,7 +4,7 @@ require 'pry'
 
 describe 'cookbook filter' do
   it 'should produce a nice frequency response graph' do
-    #sample_rate = 4000.0
+    #sample_rate = 4000
     #crit_freq = 400.0
     #min_test_freq = 10.0
     #max_test_freq = (sample_rate / 2.0) - 1.0

data/spec/resampling/discrete_resampling_spec.rb

@@ -5,7 +5,7 @@ describe SPCore::DiscreteResampling do
 
   context '.upsample' do
     it 'should produce output signal with the same max frequency (put through forward FFT)' do
-      sample_rate = 400.0
+      sample_rate = 400
       test_freq = 10.0
       size = 64
       upsample_factor = 4
@@ -30,7 +30,7 @@ describe SPCore::DiscreteResampling do
 
   context '.downsample' do
     it 'should produce output signal with the same max frequency (put through forward FFT)' do
-      sample_rate = 400.0
+      sample_rate = 400
       test_freq = 10.0
       size = 128
       downsample_factor = 4
@@ -55,7 +55,7 @@ describe SPCore::DiscreteResampling do
 
   context '.resample' do
     it 'should produce output signal with the same max frequency (put through forward FFT)' do
-      sample_rate = 400.0
+      sample_rate = 400
       test_freq = 10.0
       size = 64
       upsample_factor = 4

data/spec/resampling/hybrid_resampling_spec.rb

@@ -5,7 +5,7 @@ describe SPCore::HybridResampling do
 
   context '.resample' do
     it 'should produce output signal with the same max frequency (put through forward FFT)' do
-      sample_rate = 400.0
+      sample_rate = 400
       test_freq = 10.0
       size = 64
       upsample_factor = 4

data/spec/resampling/polynomial_resampling_spec.rb

@@ -5,7 +5,7 @@ describe SPCore::PolynomialResampling do
 
   context '.upsample' do
     it 'should produce output signal with the same max frequency (put through forward DFT)' do
-      sample_rate = 400.0
+      sample_rate = 400
       test_freq = 10.0
       size = (sample_rate * 5.0 / test_freq).to_i
       upsample_factor = 2.5

data/spec/transforms/dft_spec.rb

@@ -7,7 +7,7 @@ describe SPCore::DFT do
   
     it 'should produce a freq magnitude response peak that is within 10 percent of the test freq' do
       dft_size = 64
-      sample_rate = 400.0
+      sample_rate = 400
       
       test_freqs = [
         20.0,
@@ -39,7 +39,7 @@ describe SPCore::DFT do
   
     it 'should produce a near-identical signal to the original sent into the forward DFT (with energy that is within 10 percent error of original signal)' do
       dft_size = 32
-      sample_rate = 400.0
+      sample_rate = 400
       
       test_freqs = [
         20.0,

data/spec/transforms/fft_spec.rb

@@ -6,7 +6,7 @@ describe SPCore::FFT do
   context '.forward' do
     it 'should produce a freq magnitude response peak that is within 10 percent of the test freq' do
       fft_size = 64
-      sample_rate = 400.0
+      sample_rate = 400
       
       test_freqs = [
         20.0,
@@ -52,7 +52,7 @@ describe SPCore::FFT do
 
     it 'should produce a near-identical signal to the original sent into the forward DFT (with energy that is within 10 percent error of original signal)' do
       fft_size = 32
-      sample_rate = 400.0
+      sample_rate = 400
       
       test_freqs = [
         20.0,

data/spec/util/saturate_spec.rb

@@ -11,7 +11,7 @@ describe SPCore::Saturation do
       z_data = []
       
       osc = SPCore::Oscillator.new(
-        :sample_rate => 100.0,
+        :sample_rate => 100,
         :frequency => 1.0,
         :wave_type => SPCore::Oscillator::WAVE_SINE,
         :amplitude => 2.5
@@ -62,7 +62,7 @@ describe SPCore::Saturation do
       y_data = []
       z_data = []
       
-      osc = SPCore::Oscillator.new :sample_rate => 100.0, :frequency => 1.0, :wave_type => SPCore::Oscillator::WAVE_SINE, :amplitude => 2.5
+      osc = SPCore::Oscillator.new :sample_rate => 100, :frequency => 1.0, :wave_type => SPCore::Oscillator::WAVE_SINE, :amplitude => 2.5
       (4 * osc.sample_rate / osc.frequency).to_i.times do |n|
         x = n / osc.sample_rate
         y = osc.sample

data/spec/util/signal_generator_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe SPCore::SignalGenerator do
   before :all do
-    @sample_rate = 600.0
+    @sample_rate = 600
     @test_freqs = [
       65.0, 100.0, 250.0
     ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spcore
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashmake
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 718250849
+      hash: 407745007
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 718250849
+      hash: 407745007
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23