numo-narray 0.9.1.5 → 0.9.2.0

data/ext/numo/narray/numo/ndloop.h

@@ -1,7 +1,7 @@
 /*
   ndloop.h
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 #ifndef NDLOOP_H
 #define NDLOOP_H

data/ext/numo/narray/numo/template.h

@@ -1,7 +1,7 @@
 /*
   template.h
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 #ifndef TEMPLATE_H
 #define TEMPLATE_H
@@ -36,19 +36,17 @@
 
 #define INIT_PTR_BIT( lp, i, ad, ps, st )               \
     {                                                   \
-        ps = ((lp)->args[i].iter[0]).pos;                       \
-        ad = (BIT_DIGIT*)(((lp)->args[i]).ptr) + ps/NB; \
-        ps %= NB;                                       \
-        st = ((lp)->args[i].iter[0]).step;                      \
+        ps = ((lp)->args[i].iter[0]).pos;               \
+        ad = (BIT_DIGIT*)(((lp)->args[i]).ptr);         \
+        st = ((lp)->args[i].iter[0]).step;              \
     }
 
 #define INIT_PTR_BIT_IDX( lp, i, ad, ps, st, id )       \
     {                                                   \
-        ps = ((lp)->args[i].iter[0]).pos;                       \
-        ad = (BIT_DIGIT*)(((lp)->args[i]).ptr) + ps/NB; \
-        ps %= NB;                                       \
-        st = ((lp)->args[i].iter[0]).step;                      \
-        id = ((lp)->args[i].iter[0]).idx;                       \
+        ps = ((lp)->args[i].iter[0]).pos;               \
+        ad = (BIT_DIGIT*)(((lp)->args[i]).ptr);         \
+        st = ((lp)->args[i].iter[0]).step;              \
+        id = ((lp)->args[i].iter[0]).idx;               \
     }
 
 #define GET_DATA( ptr, type, val )                 \

data/ext/numo/narray/numo/types/complex.h

@@ -1,7 +1,7 @@
 /*
   complex.h
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 
 

data/ext/numo/narray/numo/types/complex_macro.h

@@ -117,7 +117,7 @@ static inline dtype c_from_dcomplex(dcomplex x) {
 #define m_acosh(x)   c_acosh(x)
 #define m_atanh(x)   c_atanh(x)
 #define m_hypot(x,y) c_hypot(x,y)
-#define m_sinc(x)    c_div(c_sin(x),x)
+#define m_sinc(x)    ((REAL(x)==0 && IMAG(x)==0) ? (c_new(1,0)):(c_div(c_sin(x),x)))
 
 #define m_sum_init INT2FIX(0)
 #define m_mulsum_init INT2FIX(0)

data/ext/numo/narray/numo/types/float_macro.h

@@ -110,7 +110,7 @@ extern double pow(double, double);
 #define m_atanh(x)   atanh(x)
 #define m_atan2(x,y) atan2(x,y)
 #define m_hypot(x,y) hypot(x,y)
-#define m_sinc(x)    (sin(x)/(x))
+#define m_sinc(x)    (((x)==0) ? 1.0:(sin(x)/(x)))
 
 #define m_erf(x)     erf(x)
 #define m_erfc(x)    erfc(x)

data/ext/numo/narray/numo/types/int16.h

@@ -4,8 +4,11 @@ typedef int16_t rtype;
 #define cRT cT
 
 #define m_num_to_data(x) ((dtype)NUM2INT(x))
-#define m_data_to_num(x) INT2NUM((int)(x))
-#define m_extract(x)     INT2NUM((int)*(dtype*)(x))
+#if SIZEOF_INT > 2
+#define m_data_to_num(x) INT2FIX(x)
+#else
+#define m_data_to_num(x) INT2NUM(x)
+#endif
 #define m_sprintf(s,x)   sprintf(s,"%d",(int)(x))
 
 #ifndef INT16_MIN

data/ext/numo/narray/numo/types/int32.h

@@ -5,7 +5,6 @@ typedef int32_t rtype;
 
 #define m_num_to_data(x) ((dtype)NUM2INT32(x))
 #define m_data_to_num(x) INT322NUM((int32_t)(x))
-#define m_extract(x)     INT322NUM((int32_t)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%"PRId32,(int32_t)(x))
 
 #ifndef INT32_MIN

data/ext/numo/narray/numo/types/int64.h

@@ -5,7 +5,6 @@ typedef int64_t rtype;
 
 #define m_num_to_data(x) ((dtype)NUM2INT64(x))
 #define m_data_to_num(x) INT642NUM((int64_t)(x))
-#define m_extract(x)     INT642NUM((int64_t)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%"PRId64,(int64_t)(x))
 
 #ifndef INT64_MIN

data/ext/numo/narray/numo/types/int8.h

@@ -4,8 +4,7 @@ typedef int8_t rtype;
 #define cRT cT
 
 #define m_num_to_data(x) ((dtype)NUM2INT(x))
-#define m_data_to_num(x) INT2NUM((int)(x))
-#define m_extract(x)     INT2NUM((int)*(dtype*)(x))
+#define m_data_to_num(x) INT2FIX(x)
 #define m_sprintf(s,x)   sprintf(s,"%d",(int)(x))
 
 #ifndef INT8_MIN

data/ext/numo/narray/numo/types/uint16.h

@@ -4,8 +4,11 @@ typedef u_int16_t rtype;
 #define cRT cT
 
 #define m_num_to_data(x) ((dtype)NUM2UINT(x))
-#define m_data_to_num(x) UINT2NUM((unsigned int)(x))
-#define m_extract(x)     UINT2NUM((unsigned int)*(dtype*)(x))
+#if SIZEOF_INT > 2
+#define m_data_to_num(x) INT2FIX(x)
+#else
+#define m_data_to_num(x) UINT2NUM(x)
+#endif
 #define m_sprintf(s,x)   sprintf(s,"%u",(unsigned int)(x))
 
 #ifndef UINT16_MAX

data/ext/numo/narray/numo/types/uint32.h

@@ -5,7 +5,6 @@ typedef u_int32_t rtype;
 
 #define m_num_to_data(x) ((dtype)NUM2UINT32(x))
 #define m_data_to_num(x) UINT322NUM((u_int32_t)(x))
-#define m_extract(x)     UINT322NUM((u_int32_t)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%"PRIu32,(u_int32_t)(x))
 
 #ifndef UINT32_MAX

data/ext/numo/narray/numo/types/uint64.h

@@ -5,7 +5,6 @@ typedef u_int64_t rtype;
 
 #define m_num_to_data(x) ((dtype)NUM2UINT64(x))
 #define m_data_to_num(x) UINT642NUM((u_int64_t)(x))
-#define m_extract(x)     UINT642NUM((u_int64_t)*(dtype*)(x))
 #define m_sprintf(s,x)   sprintf(s,"%"PRIu64,(u_int64_t)(x))
 
 #ifndef UINT64_MAX

data/ext/numo/narray/numo/types/uint8.h

@@ -4,8 +4,7 @@ typedef u_int8_t rtype;
 #define cRT cT
 
 #define m_num_to_data(x) ((dtype)NUM2UINT(x))
-#define m_data_to_num(x) UINT2NUM((unsigned int)(x))
-#define m_extract(x)     UINT2NUM((unsigned int)*(dtype*)(x))
+#define m_data_to_num(x) INT2FIX(x)
 #define m_sprintf(s,x)   sprintf(s,"%u",(unsigned int)(x))
 
 #ifndef UINT8_MAX

data/ext/numo/narray/numo/types/xint_macro.h

@@ -1,6 +1,8 @@
 #define m_zero 0
 #define m_one  1
 
+#define m_extract(x)    m_data_to_num(*(dtype*)(x))
+
 #define m_from_double(x) (x)
 #define m_from_real(x) (x)
 #define m_from_sint(x) (x)

data/ext/numo/narray/step.c

@@ -1,7 +1,7 @@
 /*
   step.c
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 2007-2019 Masahiro TANAKA
+    Copyright (C) 2007-2020 Masahiro TANAKA
 */
 #include <ruby.h>
 #include <math.h>

data/ext/numo/narray/struct.c

@@ -1,7 +1,7 @@
 /*
   strut.c
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 #include <ruby.h>
 #include "numo/narray.h"
@@ -813,7 +813,7 @@ nst_s_add_type(int argc, VALUE *argv, VALUE mod)
 
 #define NST_TYPEDEF(tpname,tpclass)                 \
 static VALUE                                        \
-nst_s_##tpname(VALUE argc, VALUE *argv, VALUE mod)  \
+nst_s_##tpname(int argc, VALUE *argv, VALUE mod)    \
 {   nstruct_add_type(tpclass,argc,argv,mod);        \
     return Qnil;                                    \
 }

data/lib/numo/narray.rb

@@ -1,8 +1,2 @@
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/numo/narray.so"
-rescue LoadError
-  require "numo/narray.so"
-end
-
+require "numo/narray.so"
 require "numo/narray/extra"

data/lib/numo/narray/extra.rb

@@ -106,7 +106,19 @@ module Numo
 
     # Convert the argument to an narray if not an narray.
     def self.cast(a)
-      a.kind_of?(NArray) ? a : NArray.array_type(a).cast(a)
+      case a
+      when NArray
+        a
+      when Array,Numeric
+        NArray.array_type(a).cast(a)
+      else
+        if a.respond_to?(:to_a)
+          a = a.to_a
+          NArray.array_type(a).cast(a)
+        else
+          raise TypeError,"invalid type for NArray"
+        end
+      end
     end
 
     def self.asarray(a)
@@ -1171,6 +1183,35 @@ module Numo
       end
     end
 
+    # Percentile
+    #
+    # @param q [Numo::NArray]
+    # @param axis [Integer] applied axis
+    # @return [Numo::NArray]  return percentile
+    def percentile(q, axis: nil)
+      raise ArgumentError, "q is out of range" if q < 0 || q > 100
+
+      x = self
+      unless axis
+        axis = 0
+        x = x.flatten
+      end
+
+      sorted = x.sort(axis: axis)
+      x = q / 100.0 * (sorted.shape[axis] - 1)
+      r = x % 1
+      i = x.floor
+      refs = [true] * sorted.ndim
+      refs[axis] = i
+      if i == sorted.shape[axis] - 1
+        sorted[*refs]
+      else
+        refs_upper = refs.dup
+        refs_upper[axis] = i + 1
+        sorted[*refs] + r * (sorted[*refs_upper] - sorted[*refs])
+      end
+    end
+
     # Kronecker product of two arrays.
     #
     #     kron(a,b)[k_0, k_1, ...] = a[i_0, i_1, ...] * b[j_0, j_1, ...]

data/numo-narray.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{alpha release of Numo::NArray - New NArray class library in Ruby/Numo (NUmerical MOdule)}
   spec.homepage      = "https://github.com/ruby-numo/numo-narray"
   spec.license       = "BSD-3-Clause"
-  spec.required_ruby_version = '~> 2.1'
+  spec.required_ruby_version = '>= 2.2'
 
   spec.files         = `git ls-files Gemfile README.md Rakefile lib ext numo-narray.gemspec spec`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -33,12 +33,7 @@ Gem::Specification.new do |spec|
   else
     spec.add_development_dependency "bundler", "~> 2.0"
   end
-  if RUBY_VERSION < '2.2' # Ruby 2.1.x
-    spec.add_development_dependency "rake", "<= 10.5", ">=10.1.1"
-  else
-    spec.add_development_dependency "rake", "~> 10.0"
-  end
+  spec.add_development_dependency "rake", ">= 12.3.3"
+  spec.add_development_dependency "rake-compiler", "~> 1.1"
   spec.add_development_dependency "test-unit", "~> 3.0"
-  spec.add_development_dependency 'rake-compiler', "~> 1.0", ">= 1.0.1"
-  spec.add_development_dependency "rake-compiler-dock", "~> 0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray
 version: !ruby/object:Gem::Version
-  version: 0.9.1.5
+  version: 0.9.2.0
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2021-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,64 +28,44 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '3.0'
 description: Numo::NArray - New NArray class library in Ruby/Numo.
 email:
 - masa16.tanaka@gmail.com
@@ -256,16 +236,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: alpha release of Numo::NArray - New NArray class library in Ruby/Numo (NUmerical