wavspa 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 844dc6500de04cf1cd5f297fa6a979dd4c233f5e203e135865e1e810537a0666
-  data.tar.gz: 892077f9f61abf70463c16c70c29f33063f14ae691e2c42c98552240280aa9b3
+  metadata.gz: 105e6829219b0ac7ca493a4698636783bc680396b13ebaf2886ab2380fba3421
+  data.tar.gz: 28bc152456d4152b7c5b5fa60c39bff4513fa77b6193db90b13684e699acd9bf
 SHA512:
-  metadata.gz: cc99f998f7065d64d86fefdcfd22f6053b126ff28e87178fc7f92828ca36a3d55b7d445c33099ed2301d441f696cb7a646fe00d3935a812865fda08640b073a3
-  data.tar.gz: b69d4f4e2ec12b78e57893d5a2dfa0e7a8abe4173a914ce081b26a15e950ae5dee7153cb1f5ed96ab56f309c003f783408c0afa550f50e531af6f1442de2c92d
+  metadata.gz: 1c6039a08506eb5155eb8c6d63aa23b7e3c475dc0293bad5e836db93e8aa2bfd97a7a243c41762dc5c12a2b0fc6bcada2c3e2fcf499eabbf547ef2f559c5d261
+  data.tar.gz: cb035d342c0d586df69b5f79fdfb06e0c7890e30b53f0c1e7c81ed695e174cb17f4559496dc453693b739cfdc9e2651fbbd5be5233708245337fd89cbf7958ab

data/README.md

@@ -22,6 +22,10 @@ This application uses OpenMP, but by default tries to link the libgomp. When usi
 
     $ gem insatll wavspa -- --with-openmp ~/env/opts/lib --omp-name omp
 
+if you not require OpenMP, specify the folowing option:
+
+    $ gem insatll wavspa -- --no-openmp
+
 ## Usage
 
 ### FFT analyzer
@@ -132,8 +136,8 @@ options:
     -m, --scale-mode=STRING
     -c, --col-steps=SIZE
         --show-params
-    -F, --draw-freq-line
-    -T, --draw-time-line
+    -F, --no-draw-freq-line
+    -T, --no-draw-time-line
     -v, --verbose
 ```
 
@@ -179,17 +183,17 @@ options:
   <dt>--show-params</dt>
   <dd>show sumarry of settings.</dd>
 
-  <dt>-F, --draw-freq-line</dt>
-  <dd>enable frequency line (vertical grid).</dd>
+  <dt>-F, --no-draw-freq-line</dt>
+  <dd>disable frequency line (vertical grid).</dd>
 
-  <dt>-F, --draw-freq-line</dt>
-  <dd>enable time line (horizontal grid).</dd>
+  <dt>-F, --no-draw-freq-line</dt>
+  <dd>disable time line (horizontal grid).</dd>
 
-   <dt>-v, --verbose</dt>
-   <dd>enable verbose mode</dd>
+  <dt>-v, --verbose</dt>
+  <dd>enable verbose mode</dd>
 
-   <dt>-h, --help</dt>
-   <dd>show help message</dd>
+  <dt>-h, --help</dt>
+  <dd>show help message</dd>
 </dl>
 
 ## Output example

data/ext/wavspa/fft/fft.c

@@ -816,10 +816,10 @@ fft_calc_power(fft_t* fft, double* dst)
       } 
 
       for(j = 0, a = fft->a + (lc->pos * 2); j < lc->n; j++, a += 2) {
-        v += (sqrt((a[0] * a[0]) + (a[1] * a[1])) / fq);
+        v += sqrt((a[0] * a[0]) + (a[1] * a[1]));
       }
 
-      dst[i] = v / j;
+      dst[i] = v / (j * fq);
     }
   } while(0);
 

data/ext/wavspa/wavelet/extconf.rb

@@ -2,12 +2,18 @@ require 'mkmf'
 require 'optparse'
 require 'rbconfig'
 
-omp_path = nil
-omp_name = "gomp"
+omp_enable = true
+omp_path   = nil
+omp_name   = "gomp"
 
 OptionParser.new { |opt|
-  opt.on("", "--with-openmp=PATH", String) { |path|
-    omp_path = path
+  opt.on("--[no-]openmp") { |flag|
+    omp_enable = flag
+  }
+
+  opt.on("--with-openmp=PATH", String) { |path|
+    omp_enable = true
+    omp_path   = path
   }
 
   opt.on("--omp-name=NAME", String) { |name|
@@ -17,21 +23,25 @@ OptionParser.new { |opt|
   opt.parse!(ARGV)
 }
 
-$CFLAGS << " -fopenmp"
-if omp_path
-  $CFLAGS << " -L#{omp_path}"
-  $LDFLAGS << " -L#{omp_path}"
+if omp_enable
+  $CFLAGS << " -fopenmp"
 
-  case RbConfig::CONFIG['arch']
-  when /-darwin/
-    $LDFLAGS << " -Wl,-rpath,#{omp_path}"
+  if omp_path
+    $CFLAGS << " -L#{omp_path}"
+    $LDFLAGS << " -L#{omp_path}"
 
-  else
-    # nothing
+    case RbConfig::CONFIG['arch']
+    when /-darwin/
+      $LDFLAGS << " -Wl,-rpath,#{omp_path}"
+
+    else
+      # nothing
+    end
   end
+
+  have_library(omp_name)
 end
 
 have_library("m")
-have_library(omp_name)
 
 create_makefile( "wavspa/wavelet")

data/lib/wavspa/version.rb

@@ -1,3 +1,3 @@
 module WavSpectrumAnalyzer
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavspa
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Hirosho Kuwagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler