mfilter 0.2.1.1 → 0.2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f94021bd50d56a0b8720b750006cc62c63ba3b4eef14aa1116be7cb10153830
-  data.tar.gz: 16323b60c1c9731734d52d46d55007326554e15b58a5758e601b983a355ffd6d
+  metadata.gz: 92f3f4d6bb904ff5028bd69a49711b9fbd2ecc04e16778ed92e6cfadb38b2023
+  data.tar.gz: c18409a8f3dc57a11797182746b3e03004ac28096f79c2057b317f5d76fb5471
 SHA512:
-  metadata.gz: 5a5c32475593543bf8c6c9822b5a2b5bc7fffac37b185755a2e81ee6f05380d58a4f5b10b06db7b78c31001e0964ef812181c11b2cd6d36ed1e3e07aac2b1dcc
-  data.tar.gz: 6d5305a77dc794dbee1fd565e958534e5e1ad4b05bda0cf56d3614f098d98260aeeab2919e547f778d733f06240c5814c519691cfc19d64cddf474627526fb62
+  metadata.gz: b3a0da98b651a86419f7d427ad51abcdd74380c32e6de3b3e154a3dab58e99428e5b146b8bc3847a46101650c96cbe44600d30d3721df362dcb9b6376ec1397c
+  data.tar.gz: d7347745a935d5e8e333305b6ee7a52849167a98a6f5d72c8d7a653131d388839e117963e2c45218bbfc24dce43d4faacb7547ad00d02bd6fdfbfc410f6e112d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mfilter (0.2.1)
+    mfilter (0.2.1.1)
       numo-narray (~> 0.9.2.0)
 
 GEM

data/README.md

@@ -9,6 +9,10 @@ MatLab (Octave) ライクの `filter` 関数の Ruby 実装。
 ```sh
 sudo apt update
 sudo apt install liboctave-dev -y
+
+# or
+
+brew install octave
 ```
 
 > Gemfile

data/ext/mfilter/extconf.rb

@@ -1,13 +1,44 @@
 require "mkmf"
 
-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")
+# homebrew で Octave がインストールされている場合
+oct_inc_dir = Dir.glob("#{ENV["HOME"]}/.linuxbrew/include/octave-*")
+unless oct_inc_dir.empty?
+    oct_inc_dir = oct_inc_dir[0]
+    if File.exist? oct_inc_dir
+        oct_inc_dir =~ /-(.*)$/
+        oct_ver = $1
+    else
+        raise
+    end
+    oct_inc_dir += "/octave"
+    oct_lib_dir = "#{ENV["HOME"]}/.linuxbrew/lib/octave/#{oct_ver}"
+    oct_lib_dir = File.exist?(oct_lib_dir) ? oct_lib_dir : nil
+else
+    oct_inc_dir = Dir.glob("/usr/include/octave-*")
+    unless oct_inc_dir.empty?
+        oct_inc_dir = oct_inc_dir[0]
+        if File.exist? oct_inc_dir
+            oct_inc_dir =~ /-(.*)$/
+            oct_ver = $1
+        else
+            raise
+        end
+        oct_inc_dir += "/octave"
+        oct_lib_dir = "/usr/lib/x86_64-linux-gnu/octave/#{oct_ver}"
+        oct_lib_dir = File.exist?(oct_lib_dir) ? oct_lib_dir : nil
+    else
+        raise "Octave がインストールされていません"
+    end
+end
+$LDFLAGS += " -L#{oct_lib_dir}"
+$INCFLAGS += " -I#{oct_inc_dir}"
+$libs += " -loctinterp"
+
+
 
 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")
+$LDFLAGS += " -L#{narray_dir}"
+$INCFLAGS += " -I#{narray_dir}"
+$libs += " #{narray_dir}/narray.so"
 
 create_makefile "mfilter"

data/ext/mfilter/main.cc

@@ -1,4 +1,4 @@
-#include <octave/oct.h>
+#include <oct.h>
 #include <iostream>
 #include <math.h>
 #include <vector>
@@ -44,10 +44,11 @@ VALUE rb_na_filter(VALUE self, VALUE b, VALUE a, VALUE x, VALUE si){
 
 
 VALUE rb_m_filter(VALUE self, VALUE b, VALUE a, VALUE x, VALUE si){
+    long len[3] = {RARRAY_LEN(b), RARRAY_LEN(a), RARRAY_LEN(x)};
     MArray<double>
-        mb(dim_vector(RARRAY_LEN(b), 1)),
-        ma(dim_vector(RARRAY_LEN(a), 1)),
-        mx(dim_vector(RARRAY_LEN(x), 1)),
+        mb(dim_vector(len[0], 1)),
+        ma(dim_vector(len[1], 1)),
+        mx(dim_vector(len[2], 1)),
         my;
     double* p[3] = {(double*)mb.data(), (double*)ma.data(), (double*)mx.data()};
     const VALUE* pr[3] = {
@@ -55,12 +56,11 @@ VALUE rb_m_filter(VALUE self, VALUE b, VALUE a, VALUE x, VALUE si){
         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){
@@ -71,7 +71,7 @@ VALUE rb_m_filter(VALUE self, VALUE b, VALUE a, VALUE x, VALUE si){
     }
     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)));

data/lib/mfilter/version.rb

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

data/lib/mfilter.rb

@@ -3,6 +3,10 @@
 require_relative "mfilter/version"
 
 require "numo/narray"
+
+# ENV["LD_PRELOAD"] = "/mnt/export1/st3/b033vbv/.linuxbrew/lib/libz.so"
+ENV.update({"LD_PRELOAD" => "/mnt/export1/st3/b033vbv/.linuxbrew/lib/libz.so"})
+
 require "mfilter.so"
 
 module MFilter
@@ -15,6 +19,11 @@ module MFilter
         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
+
+        if b.is_a?(Array) and a.is_a?(Array) and x.is_a?(Array)
+            return _filter(b, a, x, si)
+        end
+
         b, a, x = [Numo::DFloat.cast(b), Numo::DFloat.cast(a), Numo::DFloat.cast(x)]
         si = Numo::DFloat.cast(si) if si
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mfilter
 version: !ruby/object:Gem::Version
-  version: 0.2.1.1
+  version: 0.2.2.1
 platform: ruby
 authors:
 - Murata Mitsuharu
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2.0
-description: 
+description:
 email:
 - hikari.photon+dev@gmail.com
 executables: []
@@ -76,11 +76,11 @@ files:
 - lib/mfilter/version.rb
 - mfilter.gemspec
 - mkmf.log
-homepage: 
+homepage:
 licenses:
 - GPL-3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Function module similar to `filter` in MatLab or Octave.
 test_files: []