numo-narray-alt 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 819274f9f9bc411b8276d69966bcba8aa94bc6d61f73920f653411729e4ef247
-  data.tar.gz: c4ccb23dd013573cd80bd8ab73398fd1a67adf6018a8bd55eebff776a69df6d8
+  metadata.gz: ffcad1596b46a28e6ce8338ce16c2b047adaec57516e701aaca0f7b2ec4d0718
+  data.tar.gz: 402d148b66a7628720f66e60b0158dead80ae9abdc11bc3ac6aae38a6613d31a
 SHA512:
-  metadata.gz: 35056f83d76f4c565f45b97ee8c9c992e6e3f3d77bd63b4ad7102d26631e4fbd82caaec87cb188bd2b23baf9785068923c6e54c441a6c188492526c848e2d0c0
-  data.tar.gz: 78f1154e6e77b6d9848b5a8c1e8d5818b7daeb891f5f476950eff003d7045022f7f57b0518c51c192756bd9b140e5bef737236d168b9918fe2610365388ac2f4
+  metadata.gz: 59d49a385d2bc6dcd40d08ab3f812e33cc9cbd022e2e155d71ca17ec7ef780b5c59416618ac52f2b0fc2d3196bd331166a4613265b661b3705b7ff2ed49f50f5
+  data.tar.gz: 1e1bf70db42ee70e66aa4bfbbf2b1f5a1f76f3c06207919c5ce5d3dbadb2d28c276d9688325c33dbac9b9cbfe67d392c1ce394306c1ff5c64ea5b81ad44990de

data/README.md

@@ -77,6 +77,13 @@ $ bundle exec rubocop
 $ clang-format --dry-run --Werror --style=file ext/**/*.h ext/**/*.c
 ```
 
+This project follows [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/).
+Please run `npm install` to set up husky and commitlint for commit message validation:
+
+```shell
+$ npm install
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/yoshoku/numo-narray-alt.

data/ext/numo/narray/SFMT-params19937.h

@@ -30,22 +30,14 @@
 #define ALTI_SR2_PERM64                                                                        \
   (vector unsigned char)(15, 0, 1, 2, 3, 4, 5, 6, 17, 8, 9, 10, 11, 12, 13, 14)
 #else /* For OTHER OSs(Linux?) */
-#define ALTI_SL1                                                                               \
-  { SL1, SL1, SL1, SL1 }
-#define ALTI_SR1                                                                               \
-  { SR1, SR1, SR1, SR1 }
-#define ALTI_MSK                                                                               \
-  { MSK1, MSK2, MSK3, MSK4 }
-#define ALTI_MSK64                                                                             \
-  { MSK2, MSK1, MSK4, MSK3 }
-#define ALTI_SL2_PERM                                                                          \
-  { 1, 2, 3, 23, 5, 6, 7, 0, 9, 10, 11, 4, 13, 14, 15, 8 }
-#define ALTI_SL2_PERM64                                                                        \
-  { 1, 2, 3, 4, 5, 6, 7, 31, 9, 10, 11, 12, 13, 14, 15, 0 }
-#define ALTI_SR2_PERM                                                                          \
-  { 7, 0, 1, 2, 11, 4, 5, 6, 15, 8, 9, 10, 17, 12, 13, 14 }
-#define ALTI_SR2_PERM64                                                                        \
-  { 15, 0, 1, 2, 3, 4, 5, 6, 17, 8, 9, 10, 11, 12, 13, 14 }
+#define ALTI_SL1 { SL1, SL1, SL1, SL1 }
+#define ALTI_SR1 { SR1, SR1, SR1, SR1 }
+#define ALTI_MSK { MSK1, MSK2, MSK3, MSK4 }
+#define ALTI_MSK64 { MSK2, MSK1, MSK4, MSK3 }
+#define ALTI_SL2_PERM { 1, 2, 3, 23, 5, 6, 7, 0, 9, 10, 11, 4, 13, 14, 15, 8 }
+#define ALTI_SL2_PERM64 { 1, 2, 3, 4, 5, 6, 7, 31, 9, 10, 11, 12, 13, 14, 15, 0 }
+#define ALTI_SR2_PERM { 7, 0, 1, 2, 11, 4, 5, 6, 15, 8, 9, 10, 17, 12, 13, 14 }
+#define ALTI_SR2_PERM64 { 15, 0, 1, 2, 3, 4, 5, 6, 17, 8, 9, 10, 11, 12, 13, 14 }
 #endif /* For OSX */
 #define IDSTR "SFMT-19937:122-18-1-11-1:dfffffef-ddfecb7f-bffaffff-bffffff6"
 

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

@@ -13,8 +13,8 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.9.6"
-#define NARRAY_VERSION_CODE 960
+#define NARRAY_VERSION "0.9.7"
+#define NARRAY_VERSION_CODE 970
 
 #include <math.h>
 #include "numo/compat.h"

data/lib/numo/narray/extra.rb

@@ -1045,6 +1045,83 @@ module Numo
       a
     end
 
+    # Returns an index array of sort result.
+    #
+    # @example
+    #   require 'numo/narray'
+    #
+    #   a = Numo::DFloat[[0.1, 0.7],
+    #                    [0.4, 0.2],
+    #                    [0.2, 0.5]]
+    #   pp a.argsort
+    #   # =>
+    #   # Numo::Int32#shape=[3,2]
+    #   # [[0, 1],
+    #   #  [1, 0],
+    #   #  [0, 1]]
+    #   pp a.argsort(axis: 0)
+    #   # =>
+    #   # Numo::Int32#shape=[3,2]
+    #   # [[0, 1],
+    #   #  [2, 2],
+    #   #  [1, 0]]
+    #   pp a.argsort(axis: 1)
+    #   # =>
+    #   # Numo::Int32#shape=[3,2]
+    #   # [[0, 1],
+    #   #  [1, 0],
+    #   #  [0, 1]]
+    #   pp a.argsort(axis: nil)
+    #   # =>
+    #   # Numo::Int32#shape=[6]
+    #   # [0, 3, 4, 2, 5, 1]
+    #
+    # @overload argsort(axis: -1)
+    #   @param axis [Integer, nil] Axis along which to sort. Default is -1 (the last axis).
+    #     If `nil` is given, the array is flattened before sorting.
+    #   @return [Numo::Int32] An array of indices that would sort the array.
+    def argsort(axis_ = 'none', axis: -1)
+      raise NotImplementedError, "argsort is not implemented for #{self.class}" unless respond_to?(:sort_index)
+
+      axis = axis_ unless axis_ == 'none'
+
+      return flatten.sort_index if axis.nil?
+
+      axis = ndim + axis if axis.negative?
+      raise Numo::NArray::DimensionError, 'dimension is out of range' if axis.negative? || axis >= ndim
+
+      case ndim
+      when 1
+        sort_index
+      when 2
+        case axis
+        when 0
+          indices = transpose.sort_index(1)
+          indices.transpose - indices.min(1)
+        when 1
+          indices = sort_index(1)
+          indices - indices.min(1).expand_dims(1)
+        end
+      else
+        res = Numo::Int32.zeros(*shape)
+        slicer = Array.new(ndim)
+        slicer[axis] = true
+        other_axes = Array.new(ndim) { |i| i } - [axis]
+        axis_ids = other_axes.map do |d|
+          Array.new(shape[d]) { |i| i }
+        end
+        axis_ids.inject(:product).each do |indices|
+          indices = indices.flatten
+          other_axes.each_with_index do |d, i|
+            slicer[d] = indices[i]
+          end
+          sorted_indices = self[*slicer].sort_index
+          res[*slicer] = sorted_indices - sorted_indices.min
+        end
+        res
+      end
+    end
+
     # Return the sum along diagonals of the array.
     #
     # If 2-D array, computes the summation along its diagonal with the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray-alt
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - yoshoku
@@ -93,7 +93,7 @@ metadata:
   homepage_uri: https://github.com/yoshoku/numo-narray-alt
   source_code_uri: https://github.com/yoshoku/numo-narray-alt
   changelog_uri: https://github.com/yoshoku/numo-narray-alt/blob/main/CHANGELOG.md
-  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.9.6/
+  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.9.7/
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: