mfilter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e7491f56a38d509d83bdf57aa7dd2a04f63db5c51c29563d1a9e19a2820b16
-  data.tar.gz: a3cce8b1e0eb5513cdf22f59d09ab115218fb2254eb9a46a0532673b137e3cce
+  metadata.gz: 895c1727433c18838274084fc60e4df657a2b57165390bbe8241cb38b07d4cf2
+  data.tar.gz: d3cb564a5a9e0a4a88137fb813023519ab8843d9101c401c1e5f83dabe31939b
 SHA512:
-  metadata.gz: 2952d39fe2c612faca418d07bd01bb4042787c8898ce7933d3ca77eb5ccfd4ee18a25433788095e623bc0ca7c3cb44fcb4e3b5a8e520aa6f5a9ae7f02d4f8102
-  data.tar.gz: 8baf7ca30f4223ca67e5a1c8b73fa0b74058e0dfdf4fa1e6feeef757495519078009281214628bfbc108ff4eae67a143150ad10d5f357d812a45d9d07ff49968
+  metadata.gz: e59d5f377934bb688b810b19a2af2db133b68c904cf5b14ffaf9125f99bdfaa39e0345c04d4b08b22f030ac5037fd9f17222e624665cfbdd128bc9aeb517cea9
+  data.tar.gz: e0bd2a28a725542c8b527b9ab5fbfc185221edc74c0ffb50b1e64a5b439e98f4764a0f97236cdb6f1780a10ed4190433c27c94da25cc765813ac6c9908d528c2

data/.gitignore

@@ -6,4 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-/.vscode/
+/.vscode/
+*.dat

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    mfilter (0.1.0)
+    mfilter (0.2.1)
+      numo-narray (~> 0.9.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    numo-narray (0.9.2.0)
     rake (13.0.6)
     rake-compiler (1.1.1)
       rake
@@ -19,4 +21,4 @@ DEPENDENCIES
   rake-compiler (~> 1.1.1)
 
 BUNDLED WITH
-   2.2.1
+   2.2.22

data/README.md

@@ -1,4 +1,6 @@
 # Mfilter
+[![Gem Version](https://badge.fury.io/rb/mfilter.svg)](https://badge.fury.io/rb/mfilter)
+
 MatLab (Octave) ライクの `filter` 関数の Ruby 実装。
 
 ## インストール方法
@@ -20,12 +22,28 @@ Gem のインストールを実行:
     $ gem install specific_install
     $ gem specific_install -l "himeyama/mfilter.git"
 
-## 使用法
-
+## 使用例
 ```ruby
+#!/usr/bin/env ruby
+
 require "mfilter"
+
+t = Array.new(100){|i| -Math::PI + i * 2 * Math::PI / (100 - 1)}
+x = t.map{|e| Math::sin(e) + 0.25 * rand}
+b = [0.2] * 5
+a = [1]
+
+y = MFilter::filter(b, a, x)
+
+open("test/data.dat", "w") do |f|
+    f.puts [t, x, y].transpose.map{|e| e.join(" ")}
+end
 ```
 
+![example](https://user-images.githubusercontent.com/39254183/130913789-0245fa7f-1537-456c-8669-58ef9d9ab89c.png)
+
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/himeyama/mfilter.

data/Rakefile

@@ -6,4 +6,13 @@ task default: %i[]
 require "rake/extensiontask"
 Rake::ExtensionTask.new "mfilter" do |ext|
     ext.lib_dir = "ext"
+end
+
+
+require "rake/testtask"
+Rake::TestTask.new :test do |t|
+    t.libs << "test"
+    t.libs << "lib"
+    t.verbose = true
+    t.test_files = FileList["test/*.rb"]
 end

data/ext/mfilter/extconf.rb

@@ -1,7 +1,13 @@
 require "mkmf"
 
-have_library("octave")
+oc_file = "/usr/include/octave-#{`octave-config -p VERSION`.chop}"
+$INCFLAGS += " -I#{oc_file}" if File.exist? oc_file
+have_library("octave") 
 have_library("octinterp")
 have_library("m")
 
+narray_dir = Gem.find_files("numo").map{|e| e.include?("narray") ? e : false}.select{|e| e}.to_a[0]
+dir_config('narray', narray_dir, narray_dir)
+have_library("narray")
+
 create_makefile "mfilter"

data/ext/mfilter/main.cc

@@ -1,32 +1,88 @@
-#include <octave-5.2.0/octave/oct.h>
+#include <octave/oct.h>
 #include <iostream>
 #include <math.h>
 #include <vector>
 #include "filter.hpp"
 #include <ruby.h>
+#include <numo/narray.h>
 
+extern VALUE numo_cDFloat;
 
-VALUE rb_m_filter(VALUE self, VALUE b, VALUE a, VALUE x){
+double* NA_GET_DBL_PT(VALUE na){
+    double* p = (double*)na_get_pointer(na);
+    long offset = na_get_offset(na) / sizeof(double);
+    return p + offset;
+}
+
+VALUE rb_na_filter(VALUE self, VALUE b, VALUE a, VALUE x, VALUE si){
+    size_t len[3] = {RNARRAY_SIZE(b), RNARRAY_SIZE(a), RNARRAY_SIZE(x)};
+    MArray<double>
+        mb(dim_vector(len[0], 1)),
+        ma(dim_vector(len[1], 1)),
+        mx(dim_vector(len[2], 1)),
+        my;
+    memcpy((double*)mb.data(), NA_GET_DBL_PT(b), sizeof(double) * len[0]);
+    memcpy((double*)ma.data(), NA_GET_DBL_PT(a), sizeof(double) * len[1]);
+    memcpy((double*)mx.data(), NA_GET_DBL_PT(x), sizeof(double) * len[2]);
+    VALUE y = rb_funcall(numo_cDFloat, rb_intern("zeros"), 1, LONG2NUM(len[2]));   
+            
+    if(si == Qnil)
+        my = filter(mb, ma, mx);
+    else if(rb_obj_class(si) == numo_cDFloat){
+        long lsi = NUM2LONG(rb_funcall(si, rb_intern("size"), 0));
+        MArray<double> msi(dim_vector(lsi, 1));
+        double* namsi = NA_GET_DBL_PT(si);
+        memcpy((double*)msi.data(), namsi, sizeof(double) * lsi);
+        my = filter(mb, ma, mx, msi);
+    }
+    else
+        rb_raise(rb_eTypeError, "si should belong to Numo::DFloat class");
+    memcpy(NA_GET_DBL_PT(y),  (double*)my.data(), sizeof(double) * len[2]);
+
+    return y;
+}
+
+
+VALUE rb_m_filter(VALUE self, VALUE b, VALUE a, VALUE x, VALUE si){
     MArray<double>
         mb(dim_vector(RARRAY_LEN(b), 1)),
         ma(dim_vector(RARRAY_LEN(a), 1)),
-        mx(dim_vector(RARRAY_LEN(x), 1));
-    for(long i = 0; i < RARRAY_LEN(b); i++)
-        mb(i, 0) = NUM2DBL(rb_ary_entry(b, i));
-    for(long i = 0; i < RARRAY_LEN(a); i++)
-        ma(i, 0) = NUM2DBL(rb_ary_entry(a, i));
-    for(long i = 0; i < RARRAY_LEN(x); i++)
-        mx(i, 0) = NUM2DBL(rb_ary_entry(x, i));
-    MArray<double> my = filter(mb, ma, mx);
-    VALUE y = rb_ary_new();
+        mx(dim_vector(RARRAY_LEN(x), 1)),
+        my;
+    double* p[3] = {(double*)mb.data(), (double*)ma.data(), (double*)mx.data()};
+    const VALUE* pr[3] = {
+        RARRAY_CONST_PTR_TRANSIENT(b),
+        RARRAY_CONST_PTR_TRANSIENT(a),
+        RARRAY_CONST_PTR_TRANSIENT(x)
+    };
+    long len[3] = {RARRAY_LEN(b), RARRAY_LEN(a), RARRAY_LEN(x)};
+    VALUE y;
+    for(int n = 0; n < 3; n++)
+        for(long i = 0; i < len[n]; i++)
+            p[n][i] = NUM2DBL(pr[n][i]);
+    
+    if(si == Qnil)
+        my = filter(mb, ma, mx);
+    else if(rb_obj_class(si) == rb_cArray){
+        MArray<double> msi(dim_vector(RARRAY_LEN(si), 1));
+        for(long i = 0; i < RARRAY_LEN(si); i++)
+            msi(i, 0) = NUM2DBL(rb_ary_entry(si, i));
+        my = filter(mb, ma, mx, msi);
+    }
+    else
+        rb_raise(rb_eTypeError, "si should belong to Array class");
+    
+    y = rb_ary_new();
     for(long i = 0; i < RARRAY_LEN(x); i++)
         rb_ary_store(y, i, DBL2NUM(my(i, 0)));
+    
     return y;
 }
 
 extern "C"{
     void Init_mfilter(){
         VALUE rb_cMFilter = rb_define_module("MFilter");
-        rb_define_module_function(rb_cMFilter, "filter", RUBY_METHOD_FUNC(rb_m_filter), 3);
+        rb_define_module_function(rb_cMFilter, "_filter", rb_m_filter, 4);
+        rb_define_module_function(rb_cMFilter, "na_filter", rb_na_filter, 4);
     }
 }

data/lib/mfilter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mfilter
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/mfilter.rb

@@ -2,9 +2,26 @@
 
 require_relative "mfilter/version"
 
+require "numo/narray"
 require "mfilter.so"
 
-module Mfilter
-  class Error < StandardError; end
-  # Your code goes here...
+module MFilter
+    class Error < StandardError; end
+    
+    def filter(b, a, x, si: nil)
+        raise TypeError, "b should belong to Array or Numeric class" unless b.is_a? Array or b.is_a? Numeric or b.is_a? Numo::DFloat
+        raise TypeError, "a should belong to Array or Numeric class" unless a.is_a? Array or a.is_a? Numeric or a.is_a? Numo::DFloat
+        raise TypeError, "x should belong to Array class" unless x.is_a? Array or x.is_a? Numo::DFloat
+        raise TypeError, "si should be nil or belong to Array class" unless si.is_a? Array or si.nil? or si.is_a? Numo::DFloat
+        b = [b.to_f] if b.is_a? Numeric
+        a = [a.to_f] if a.is_a? Numeric
+        b, a, x = [Numo::DFloat.cast(b), Numo::DFloat.cast(a), Numo::DFloat.cast(x)]
+        si = Numo::DFloat.cast(si) if si
+
+        if b.is_a?(Numo::DFloat) and a.is_a?(Numo::DFloat) and x.is_a?(Numo::DFloat)
+            return na_filter(b, a, x, si)
+        end
+    end
+
+    module_function :filter
 end

data/mfilter.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rake-compiler", "~> 1.1.1"
+  spec.add_dependency "numo-narray", "~> 0.9.2.0"
 end

data/mkmf.log

@@ -0,0 +1,37 @@
+have_library: checking for -lnarray... -------------------- no
+
+"gcc -o conftest -I/home/hikari/.rbenv/versions/3.0.2/include/ruby-3.0.0/x86_64-linux -I/home/hikari/.rbenv/versions/3.0.2/include/ruby-3.0.0/ruby/backward -I/home/hikari/.rbenv/versions/3.0.2/include/ruby-3.0.0 -I. -I/home/hikari/.rbenv/versions/3.0.2/lib/ruby/gems/3.0.0/gems/numo-narray-0.9.2.0/lib/numo -I/home/hikari/.rbenv/versions/3.0.2/include    -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wduplicated-cond -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wwrite-strings -Wimplicit-fallthrough=0 -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wunused-variable  -fPIC conftest.c  -L. -L/home/hikari/.rbenv/versions/3.0.2/lib -Wl,-rpath,/home/hikari/.rbenv/versions/3.0.2/lib -L/home/hikari/.rbenv/versions/3.0.2/lib/ruby/gems/3.0.0/gems/numo-narray-0.9.2.0/lib/numo -Wl,-rpath,/home/hikari/.rbenv/versions/3.0.2/lib/ruby/gems/3.0.0/gems/numo-narray-0.9.2.0/lib/numo -L. -L/home/hikari/.rbenv/versions/3.0.2/lib  -fstack-protector-strong -rdynamic -Wl,-export-dynamic     -Wl,-rpath,/home/hikari/.rbenv/versions/3.0.2/lib -L/home/hikari/.rbenv/versions/3.0.2/lib -lruby  -lm   -lc"
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: int main(int argc, char **argv)
+4: {
+5:   return !!argv[argc];
+6: }
+/* end */
+
+"gcc -o conftest -I/home/hikari/.rbenv/versions/3.0.2/include/ruby-3.0.0/x86_64-linux -I/home/hikari/.rbenv/versions/3.0.2/include/ruby-3.0.0/ruby/backward -I/home/hikari/.rbenv/versions/3.0.2/include/ruby-3.0.0 -I. -I/home/hikari/.rbenv/versions/3.0.2/lib/ruby/gems/3.0.0/gems/numo-narray-0.9.2.0/lib/numo -I/home/hikari/.rbenv/versions/3.0.2/include    -O3 -ggdb3 -Wall -Wextra -Wdeprecated-declarations -Wduplicated-cond -Wimplicit-function-declaration -Wimplicit-int -Wmisleading-indentation -Wpointer-arith -Wwrite-strings -Wimplicit-fallthrough=0 -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-packed-bitfield-compat -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wunused-variable  -fPIC conftest.c  -L. -L/home/hikari/.rbenv/versions/3.0.2/lib -Wl,-rpath,/home/hikari/.rbenv/versions/3.0.2/lib -L/home/hikari/.rbenv/versions/3.0.2/lib/ruby/gems/3.0.0/gems/numo-narray-0.9.2.0/lib/numo -Wl,-rpath,/home/hikari/.rbenv/versions/3.0.2/lib/ruby/gems/3.0.0/gems/numo-narray-0.9.2.0/lib/numo -L. -L/home/hikari/.rbenv/versions/3.0.2/lib  -fstack-protector-strong -rdynamic -Wl,-export-dynamic     -Wl,-rpath,/home/hikari/.rbenv/versions/3.0.2/lib -L/home/hikari/.rbenv/versions/3.0.2/lib -lruby -lnarray  -lm   -lc"
+/home/hikari/.linuxbrew/bin/ld: cannot find -lnarray
+collect2: error: ld returned 1 exit status
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: /*top*/
+ 4: extern int t(void);
+ 5: int main(int argc, char **argv)
+ 6: {
+ 7:   if (argc > 1000000) {
+ 8:     int (* volatile tp)(void)=(int (*)(void))&t;
+ 9:     printf("%d", (*tp)());
+10:   }
+11: 
+12:   return !!argv[argc];
+13: }
+14: 
+15: int t(void) { ; return 0; }
+/* end */
+
+--------------------
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mfilter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Murata Mitsuharu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: numo-narray
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2.0
 description: 
 email:
 - hikari.photon+dev@gmail.com
@@ -60,6 +74,7 @@ files:
 - lib/mfilter.rb
 - lib/mfilter/version.rb
 - mfilter.gemspec
+- mkmf.log
 homepage: 
 licenses: []
 metadata: {}