spectrum-analyzer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmNhN2RmNGEzMTMwMTgyYjE2NDk4ODY4YWUxMzIwYTkxOTRlNmQ5NQ==
+    NGE0ZWFkNjFhMmQ3NmRkZmU4ODRlOGUwNmZlMDIwNzVkYjRlZmEwZg==
   data.tar.gz: !binary |-
-    MjgxMzg5NzA3Mjg1YmIzYjMzMWI1ZTM3ZjdiYWYxODg1ZGRmNTE4Zg==
+    ZWIxZTdmZmVhOGM1Yzg2OGE3OTAwNGQyMDAxNTc4MWJjYWY3YjEyMA==
 SHA512:
   metadata.gz: !binary |-
-    NzU4YmYxOTVjNzg3MTU1ODA3MmQzYjk5ZTA1YzEwNDJjY2I4NjViMzgyMGVm
-    NDYzZjE0MDhmOTQ0MzJlM2FlMGJlYzY2Njg2YzAwNTAxZTlhMTg4ZjQ1YzQy
-    NWNmMjU2NjM2ZTA3M2UzY2Q3YjI4NjI4MWNiMWNiNjVhZTI4ZTQ=
+    Yzc4ODFlZDU5YzM3MTg3NzliMzc4MzQ0NzUxYTM5MDRiYTBhMGZkZDlmNDI0
+    YWJiZmE4NDhhN2MxYjRlNmExZDRmNmIwYTY1NTZhMzdhNzY3NGQzYzE0MjI5
+    M2VlNWM3ZGI3MzYxMjgxYTA4NjA1ZjAyOGMyN2E2YjcyNDIyNzU=
   data.tar.gz: !binary |-
-    ZDBiYWIyYmYzZmViYjI3MThhMWM5NTE1OGEzYzIwNjI3MjI1NDcyMzFhYzFm
-    NDU2ZThlMjg0MDJkOGUyMDUzZTY4ZjAxMWNkMjkxNTkyYmVlYjViMmExZDE4
-    ZjNjNTU0M2I3Njc0YjY1Zjc1YzEzNWE5ODUxNDZmZjZhNDdjYzA=
+    ZmNkNzViYmNiMTk4YmQ1MmIxYTcyNDQ5NjViMzhlN2Y0MmEwMGIwOGQzYjYy
+    MjdmZWM4NWI0NzNlMDYxZTJkMjFmMjY0YTY3ODM5YTFiYjZjOGE5MGQzMjlk
+    NjYwNGJkOTFkNGQyMDA3OWZiNDYzZjNlNDEzMGJjYWZmZmIxY2M=

data/README.md

@@ -28,7 +28,9 @@ You now have a bunch of "domains" held in the spectrum (SpectrumAnalyzer.spectru
 s = SpectrumAnalyzer.spectrum
 s.domains
 ```
-These domains are an array of frequencies that occur over the time slice defined by the window_size. The values are currently complex numbers, but they represent decibels of each frequency range in that window.
+These domains are an array of frequencies that occur over the time slice defined by the window_size. The values are currently magnitudes of the complex numbers, and represent the amplitude of each frequency range. 
+
+Want them to be available as both complex and magnitudes? Let me know, or submit a pull request!
 
 More to come.
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/spectrum-analyzer/clients/generator.rb

@@ -4,6 +4,7 @@ module SpectrumAnalyzer
       @config = SpectrumAnalyzer.configuration
       @file = build_file_info
       @spectrum = SpectrumAnalyzer.spectrum
+      @window_functions = SpectrumAnalyzer::WindowFunctions.new(@config.window_size)
     end
 
     def set_file(file)
@@ -26,25 +27,12 @@ module SpectrumAnalyzer
 
 
     def generate_spectrum
-      #For each FFT window built
-        #add FFT window to spectrum class
       begin
         buffer = RubyAudio::Buffer.float(@config.window_size)
         RubyAudio::Sound.open(@config.file_name) do |snd|
           while snd.read(buffer) != 0
-            fft_slice = generate_domain(buffer)
-            @spectrum.domains.push (SpectrumAnalyzer::Domain.new(fft_slice))
-            #i=0
-            #fft_slice.each { |x| spectrum[i] += x.magnitude; i+=1}
-            #
-            #spectrum_array[iterations] = fft_slice
-            #i = 0
-            #spectrum_array[iterations].each { |x| spectrum_array[iterations][i] = x.magnitude; i+=1}
-            #iterations += 1
-            #
-            #ping = analyze_for_hit(fft_slice, iterations - 1)
-            #return ping if ping
-            #hits += 1 if ping
+            domain = generate_domain(buffer)
+            @spectrum.domains.push (domain)
           end
         end
 
@@ -58,8 +46,8 @@ module SpectrumAnalyzer
       windowed_array = apply_window(buffer.to_a, windows[@config.window_function])
       na = NArray.to_na(windowed_array)
       fft_array = FFTW3.fft(na).to_a[0, @config.window_size/2]
-      domain = Array.new()
-      fft_array.each { |x| domain.push(x.magnitude)}
+      domain = SpectrumAnalyzer::Domain.new()
+      fft_array.each { |x| domain.raw_values.push(x); domain.values.push(x.magnitude)}
       domain
     end
 
@@ -79,8 +67,8 @@ module SpectrumAnalyzer
 
     def windows
       {
-          :hanning => hanning(@config.window_size),
-          :rectangle => rectangle(@config.window_size)
+          :hanning => @window_functions.hanning(),
+          :rectangle => @window_functions.rectangle()
       }
     end
 
@@ -99,18 +87,6 @@ module SpectrumAnalyzer
       buffer.each { |x| windowed_array[i] = x * window_type[i]; i+=1}
     end
 
-    def hanning (window_size)
-      hannified_array = Array.new
-      i=0
-      (0..window_size).each { |x| hannified_array[i] = 0.5 - 0.5 * Math.cos(2 * Math::PI * i / window_size) ; i+=1}
-
-      hannified_array
-    end
-
-    def rectangle (window_size)
-      Array.new(window_size, 1)
-    end
-
     def analysis_array
       @config.analysis_array
     end

data/lib/spectrum-analyzer/clients/window_functions.rb

@@ -0,0 +1,19 @@
+module SpectrumAnalyzer
+  class WindowFunctions
+    def initialize(window_size)
+      @window_size = window_size
+    end
+    def hanning
+      hannified_array = Array.new
+      i=0
+      (0..@window_size).each { |x| hannified_array[i] = 0.5 - 0.5 * Math.cos(2 * Math::PI * i / @window_size) ; i+=1}
+
+      hannified_array
+    end
+
+    def rectangle
+      Array.new(@window_size, 1)
+    end
+
+  end
+end

data/lib/spectrum-analyzer/criteria/domain.rb

@@ -1,9 +1,10 @@
 module SpectrumAnalyzer
   class Domain
-    attr_accessor :values, :contains_frequency_range
+    attr_accessor :values, :raw_values, :contains_frequency_range
 
-    def initialize(values)
-      @values = values
+    def initialize()
+      @values = []
+      @raw_values = []
     end
   end
 end

data/spectrum-analyzer.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: spectrum-analyzer 0.1.2 ruby lib
+# stub: spectrum-analyzer 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "spectrum-analyzer"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Roberts"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "lib/spectrum-analyzer.rb",
     "lib/spectrum-analyzer/clients/analyze.rb",
     "lib/spectrum-analyzer/clients/generator.rb",
+    "lib/spectrum-analyzer/clients/window_functions.rb",
     "lib/spectrum-analyzer/config.rb",
     "lib/spectrum-analyzer/criteria/domain.rb",
     "lib/spectrum-analyzer/criteria/file.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectrum-analyzer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Justin Roberts
@@ -127,6 +127,7 @@ files:
 - lib/spectrum-analyzer.rb
 - lib/spectrum-analyzer/clients/analyze.rb
 - lib/spectrum-analyzer/clients/generator.rb
+- lib/spectrum-analyzer/clients/window_functions.rb
 - lib/spectrum-analyzer/config.rb
 - lib/spectrum-analyzer/criteria/domain.rb
 - lib/spectrum-analyzer/criteria/file.rb