spectrum-analyzer 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGE0ZWFkNjFhMmQ3NmRkZmU4ODRlOGUwNmZlMDIwNzVkYjRlZmEwZg==
+    NTU2MDRiMjNmMjlmMWFlZWQ5ZjRlNjU5ODFiMDg0NzlhMjVhZTc2NA==
   data.tar.gz: !binary |-
-    ZWIxZTdmZmVhOGM1Yzg2OGE3OTAwNGQyMDAxNTc4MWJjYWY3YjEyMA==
+    MTE3YzkxY2FkNmNjNTJhMjI5M2M5ZjM4MmU1MTE1Y2ZhMWUyMjY4Yw==
 SHA512:
   metadata.gz: !binary |-
-    Yzc4ODFlZDU5YzM3MTg3NzliMzc4MzQ0NzUxYTM5MDRiYTBhMGZkZDlmNDI0
-    YWJiZmE4NDhhN2MxYjRlNmExZDRmNmIwYTY1NTZhMzdhNzY3NGQzYzE0MjI5
-    M2VlNWM3ZGI3MzYxMjgxYTA4NjA1ZjAyOGMyN2E2YjcyNDIyNzU=
+    NTU3MGY2NjczZmQwNTAyZDQwYjUwZTI0NTdiYTFiZTVjYzQ5NjA2NWIzOWNm
+    ZGQ2OWQ0OTFkODFjOGQxMDQ2YzAyYzQzY2NlZDJlMDhiYTI1OWIzZjAyZjE0
+    YzE0NzUwYzE4Y2IyMWI5YzllOWJlZGY3NTBlYjJmNzk1YzQzNGE=
   data.tar.gz: !binary |-
-    ZmNkNzViYmNiMTk4YmQ1MmIxYTcyNDQ5NjViMzhlN2Y0MmEwMGIwOGQzYjYy
-    MjdmZWM4NWI0NzNlMDYxZTJkMjFmMjY0YTY3ODM5YTFiYjZjOGE5MGQzMjlk
-    NjYwNGJkOTFkNGQyMDA3OWZiNDYzZjNlNDEzMGJjYWZmZmIxY2M=
+    ZDE5ZjU5NjBhNjJlYTdkOGY5MDc4YjdlZmQyMGUzNTBhOTMyMGI3MzE2NWYx
+    MzljNTY3OTg1YzhhNDcxZmNkNjIyMGQ1MjM5ZDFkZTA1OTgzNzBjYjY1Njlh
+    NjY3ZjUwMjBkYjM3ZjI0OGViNzgwYjczNjljZTMzOGQ0MGNkMDk=

data/README.md

@@ -1,4 +1,4 @@
-[![Code Climate](https://codeclimate.com/github/jusroberts/spectrum-analyzer.png)](https://codeclimate.com/github/jusroberts/spectrum-analyzer)
+[![Code Climate](https://codeclimate.com/github/jusroberts/spectrum-analyzer.png)](https://codeclimate.com/github/jusroberts/spectrum-analyzer) [![Gem Version](https://badge.fury.io/rb/spectrum-analyzer.png)](http://badge.fury.io/rb/spectrum-analyzer)
 # Ruby Sound Spectrum Analyzer
 
 Have you ever wanted to break apart a sound file and see what frequencies make it up? Well, you're in luck! This program does JUST THAT!!!!
@@ -28,7 +28,7 @@ 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 magnitudes of the complex numbers, and represent the amplitude of each frequency range. 
+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 the complex numbers themselves. They represent the amplitude of the frequency ranges. 
 
 Want them to be available as both complex and magnitudes? Let me know, or submit a pull request!
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

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

@@ -42,6 +42,13 @@ module SpectrumAnalyzer
       end
     end
 
+    def sum_domains
+      @spectrum.entire_spectrum = Array.new(@spectrum.domains[0].values.length, 0)
+      @spectrum.domains.each do |domain|
+        @spectrum.entire_spectrum.map!.with_index{ |x,i| x + domain.values[i]}
+      end
+    end
+
     def generate_domain(buffer)
       windowed_array = apply_window(buffer.to_a, windows[@config.window_function])
       na = NArray.to_na(windowed_array)
@@ -52,11 +59,31 @@ module SpectrumAnalyzer
     end
 
     def analyze_spectrum
-      #for each FFT window in spectrum class
-        #determine if window contains hit
-          #apply hit bool to that fft object
-      #sum all FFT windows in spectrum to create overall freq spectrum
-      #return spectrum class
+      sum_domains
+      find_occurrences
+    end
+
+    def find_occurrences
+      ranges = @config.analysis_ranges
+      occurrence_count = 0
+      @spectrum.domains.each do |domain|
+        ranges.each do |range|
+          if find_occurrence(range, domain)
+            occurrence_count += 1
+            domain.contains_frequency_range = true
+          end
+        end
+      end
+      @spectrum.num_occurrences = occurrence_count
+    end
+
+    def find_occurrence (range, domain)
+      sum_total = 0
+      for i in range[:b_index]..range[:t_index]
+        sum_total += domain.values[i] if !domain.nil?
+      end
+      average = sum_total / (range[:t_index] - range[:b_index])
+      average > range[:min] and average < range[:max]
     end
 
     def build_file_info

data/lib/spectrum-analyzer/config.rb

@@ -1,11 +1,11 @@
 module SpectrumAnalyzer
   class Config
-    attr_accessor :file_name, :window_function, :window_size, :analysis_range
+    attr_accessor :file_name, :window_function, :window_size, :analysis_ranges
 
     def initialize
       @window_size        = 512
       @window_function    = :hanning
-      @analysis_array     = [{ :b_index => 27, :t_index => 47,   :min => 1,    :max => 2},     #Low area
+      @analysis_ranges     = [{ :b_index => 27, :t_index => 47,   :min => 1,    :max => 2},     #Low area
                              { :b_index => 58, :t_index => 64,   :min => 2.5,  :max => 6.5},   #High peak
                              { :b_index => 70, :t_index => 74,   :min => 2.0,  :max => 4.2 },  #Mid peak
                              { :b_index => 82, :t_index => 109,  :min => 0.8,  :max => 2}]     #Low area

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

@@ -5,6 +5,8 @@ module SpectrumAnalyzer
     def initialize()
       @values = []
       @raw_values = []
+      @contains_frequency_range = false
     end
+
   end
 end

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

@@ -1,6 +1,6 @@
 module SpectrumAnalyzer
   class Spectrum
-    attr_accessor :domains, :entire_spectrum
+    attr_accessor :domains, :entire_spectrum, :num_occurrences
 
     def initialize(spectrum = [])
       @domains = spectrum

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.3 ruby lib
+# stub: spectrum-analyzer 0.1.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "spectrum-analyzer"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Roberts"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectrum-analyzer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Justin Roberts