numo-narray 0.9.1.6 → 0.9.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2232329c5ed735d60a1b661d6a0db1b9522cc9cad8f98eb8fc1c6db9026b2cb
-  data.tar.gz: ef322c74597e29f8e10c62887feceedc400bbadaa6858ffe80f60949ca31f56d
+  metadata.gz: 13fa1238cfb0a52ebd9c7f067e43660316027ecf0c9f03c387f0022c0ba4dace
+  data.tar.gz: bc4bbdb7664ae87f1be7ed302dcae63d852f09ed05dcd5a30a8f6e8368bdd2de
 SHA512:
-  metadata.gz: 9a745b45d333641210bd942a39609b32df1a18638fdbe03c50fd884c5b31c186816019e2a02532ed23b719b24869054434ea227c0a0a9254155d0dc4d9fd1be4
-  data.tar.gz: 288ea51ef740d909a6f66f5506de47112071d7d6fb7fe6e9bf6e2c04f470ac397cfc3b1edd8da1fd1228ffc5b3ef31eecc6f7265867ec51d03f40ebe88c2d35d
+  metadata.gz: bd834ddb4e45505e61d6bf81b7d4b8147228d12c3321d9fb3cc2fc8a3f51fe40e885010fc59e0a44b1f0d4b11780b2744f2b36236446dab178f91a1fb633d096
+  data.tar.gz: 0d75394f0ce6c63329de7c8549644fa8c3c5d5ada1883a8f48175c6683cb573b507006302b64ca31e4c12d58577f1a47ff9ca3ae4237e72dac76d52be4f3d1d8

data/README.md

@@ -1,4 +1,4 @@
-# Numo::NArray - New NArray class library for Ruby/Numo (NUmerical MOdule)
+# Numo::NArray
 
 [![Binder](http://mybinder.org/badge.svg)](http://mybinder.org/repo/ruby-numo/numo-narray)
 [![Build Status](https://travis-ci.org/ruby-numo/numo-narray.svg?branch=master)](https://travis-ci.org/ruby-numo/numo-narray)
@@ -18,7 +18,7 @@ All documents are primitive.
 * [Numo::NArray API Doc](http://ruby-numo.github.io/numo-narray/yard/index.html)
 * [Numo::NArray vs numpy](https://github.com/ruby-numo/numo-narray/wiki/Numo-vs-numpy)
 * [Numo::NArray vs ndarray](https://github.com/ruby-numo/numo-narray/wiki/Numo-vs-ndarray)
-* [Numo::NArray Overview](https://github.com/ruby-numo/numo-narray/wiki/Numo::NArray%E6%A6%82%E8%A6%81) (in Japanese)
+* [Numo::NArray Overview](https://github.com/ruby-numo/numo-narray/wiki/Numo::NArray-Overview-(Japanese)) (in Japanese)
 
 ## Related Projects
 

data/ext/numo/narray/array.c

@@ -1,7 +1,7 @@
 /*
   array.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"
@@ -31,15 +31,12 @@ static ID id_abs;
 static ID id_cast;
 static ID id_le;
 static ID id_Complex;
-
+static VALUE int32_max = Qnil;
+static VALUE int32_min = Qnil;
 
 static VALUE
  na_object_type(int type, VALUE v)
 {
-    static VALUE int32_max = Qnil;
-    if (NIL_P(int32_max))
-        int32_max = ULONG2NUM(2147483647);
-
     switch(TYPE(v)) {
 
     case T_TRUE:
@@ -55,8 +52,8 @@ static VALUE
         return type;
     case T_BIGNUM:
         if (type<NA_INT64) {
-            v = rb_funcall(v,id_abs,0);
-            if (RTEST(rb_funcall(v,id_le,1,int32_max))) {
+            if (RTEST(rb_funcall(v,id_le,1,int32_max)) &&
+                RTEST(rb_funcall(v,id_ge,1,int32_min))) {
                 if (type<NA_INT32)
                     return NA_INT32;
             } else {
@@ -69,8 +66,7 @@ static VALUE
     case T_FIXNUM:
         if (type<NA_INT64) {
             long x = NUM2LONG(v);
-            if (x<0) x=-x;
-            if (x<=2147483647) {
+            if (x<=2147483647 && x>=-2147483648) {
                 if (type<NA_INT32)
                     return NA_INT32;
             } else {
@@ -86,8 +82,8 @@ static VALUE
     case T_FIXNUM:
     case T_BIGNUM:
         if (type<NA_INT64) {
-            v = rb_funcall(v,id_abs,0);
-            if (RTEST(rb_funcall(v,id_le,1,int32_max))) {
+            if (RTEST(rb_funcall(v,id_le,1,int32_max)) &&
+                RTEST(rb_funcall(v,id_ge,1,int32_min))) {
                 if (type<NA_INT32)
                     return NA_INT32;
             } else {
@@ -650,4 +646,9 @@ Init_nary_array()
     id_abs     = rb_intern("abs");
     id_le      = rb_intern("<=");
     id_Complex = rb_intern("Complex");
+
+    rb_global_variable(&int32_max);
+    int32_max = INT2NUM(2147483647);
+    rb_global_variable(&int32_min);
+    int32_min = INT2NUM(-2147483648);
 }

data/ext/numo/narray/data.c

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

data/ext/numo/narray/gen/cogen.rb

@@ -66,7 +66,7 @@ code = DefLib.new do
 end.result
 
 if $output
-  open($output,"w").write(code)
+  File.write($output, code)
 else
   $stdout.write(code)
 end

data/ext/numo/narray/gen/spec.rb

@@ -3,6 +3,7 @@ def_id "eq"
 def_id "ne"
 def_id "pow"
 def_id "mulsum"
+def_id "to_a"
 if is_complex
   def_id "real"
   def_id "imag"

data/ext/numo/narray/gen/tmpl/cast.c

@@ -35,6 +35,13 @@ static VALUE
         }
         return v;
     }
+    if (rb_respond_to(obj,id_to_a)) {
+        obj = rb_funcall(obj,id_to_a,0);
+        if (TYPE(obj)!=T_ARRAY) {
+            rb_raise(rb_eTypeError, "`to_a' did not return Array");
+        }
+        return <%=find_tmpl("cast_array").c_func%>(obj);
+    }
     <% if is_object %>
     return robject_new_dim0(obj);
     <% else %>

data/ext/numo/narray/gen/tmpl/lib.c

@@ -3,7 +3,7 @@
   Ruby/Numo::NArray - Numerical Array class for Ruby
 
   created on: 2017-03-11
-  Copyright (C) 2017-2019 Masahiro Tanaka
+  Copyright (C) 2017-2020 Masahiro Tanaka
 */
 
 #include <ruby.h>

data/ext/numo/narray/gen/tmpl/store.c

@@ -30,6 +30,15 @@ static VALUE
         }
     }
 
+    if (rb_respond_to(obj,id_to_a)) {
+        obj = rb_funcall(obj,id_to_a,0);
+        if (TYPE(obj)!=T_ARRAY) {
+            rb_raise(rb_eTypeError, "`to_a' did not return Array");
+        }
+        <%=store_array.c_func%>(self,obj);
+        return self;
+    }
+
     <% if is_object %>
     robject_store_numeric(self,obj);
     <% else %>

data/ext/numo/narray/index.c

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

data/ext/numo/narray/math.c

@@ -1,7 +1,7 @@
 /*
   math.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"

data/ext/numo/narray/narray.c

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

data/ext/numo/narray/ndloop.c

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

data/ext/numo/narray/numo/intern.h

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

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

@@ -1,7 +1,7 @@
 /*
   narray.h
   Ruby/Numo::NArray - Numerical Array class for Ruby
-    Copyright (C) 1999-2019 Masahiro TANAKA
+    Copyright (C) 1999-2020 Masahiro TANAKA
 */
 #ifndef NARRAY_H
 #define NARRAY_H
@@ -13,8 +13,8 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.9.1.6"
-#define NARRAY_VERSION_CODE 916
+#define NARRAY_VERSION "0.9.1.7"
+#define NARRAY_VERSION_CODE 917
 
 #include <math.h>
 #include "numo/compat.h"

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

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/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"

data/lib/numo/narray/extra.rb

@@ -1171,6 +1171,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,10 +33,6 @@ 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 "test-unit", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray
 version: !ruby/object:Gem::Version
-  version: 0.9.1.6
+  version: 0.9.1.7
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +224,7 @@ 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:
   - - ">="