red_amber 0.2.2 → 0.2.3

data/lib/red_amber/vector_updatable.rb

@@ -4,41 +4,47 @@
 # reference: https://arrow.apache.org/docs/cpp/compute.html
 
 module RedAmber
-  # mix-ins for class Vector
+  # mix-in for class Vector
   # Functions to make up some data (especially missing) for new data.
   module VectorUpdatable
     # Replace data
-    # @param arg [Array, Vector, Arrow::Array] index specifier or boolean
-    # @param replacer [Array, Vector, Arrow::Array] new data to replace for.
+    # @param specifier [Array, Vector, Arrow::Array] index or booleans.
+    # @param replacer [Scalar, Array, Vector, Arrow::Array] new data to replace for.
     # @return [Vector] Replaced new Vector.
-    #   If arg has no true, return self.
-    def replace(args, replacer)
-      args =
-        case args
-        when Array
-          args
-        when Range
-          normalize_element(args)
-        else
-          Array(args)
-        end
-      replacer = Array(replacer)
-      return self if args.empty? || args[0].nil?
+    #   If specifier has no true, return self.
+    #
+    def replace(specifier, replacer)
+      vector = parse_to_vector(Array(specifier))
+      return self if vector.empty? || empty?
 
-      vector = parse_to_vector(args)
-      replacer = nil if replacer.empty?
       booleans =
         if vector.boolean?
-          return self unless vector.any
-
           vector
         elsif vector.numeric?
-          replacer.sort_by! { |x| args[replacer.index(x)] } if replacer # rubocop:disable Style/SafeNavigation
           Vector.new(indices).is_in(vector)
         else
-          raise VectorArgumentError, "Invalid data type #{args}"
+          raise VectorArgumentError, "Invalid data type #{specifier}"
+        end
+      return self if booleans.sum.zero?
+
+      replacer_array =
+        case replacer
+        in []
+          return self
+        in nil | [nil]
+          return replace_to_nil(booleans.data)
+        in Arrow::Array
+        # nop
+        in Vector
+          replacer.data
+        in Array
+          Arrow::Array.new(replacer)
+        else # Broadcast scalar to Array
+          Arrow::Array.new(Array(replacer) * booleans.to_a.count(true))
         end
-      replace_with(booleans, replacer)
+      raise VectorArgumentError, 'Replacements size unmatch' if booleans.sum != replacer_array.length
+
+      replace_with(booleans.data, replacer_array)
     end
 
     # (related functions)
@@ -76,52 +82,41 @@ module RedAmber
 
     private
 
-    # [Ternary]: replace_with(booleans, replacements) => vector
-    # Replace items selected with a boolean mask
+    # Replace elements selected with a boolean mask
     #
-    # (from Arrow C++ inline doc.)
-    # Given an array and a boolean mask (either scalar or of equal length),
-    # along with replacement values (either scalar or array),
-    # each element of the array for which the corresponding mask element is
-    # true will be replaced by the next value from the replacements,
-    # or with null if the mask is null.
-    # Hence, for replacement arrays, len(replacements) == sum(mask == true).
-
-    def replace_with(booleans, replacer = nil)
-      specifier =
-        if booleans.is_a?(Arrow::BooleanArray)
-          booleans
-        elsif booleans.is_a?(Vector) && booleans.boolean?
-          booleans.data
-        elsif booleans.is_a?(Array) && booleans?(booleans)
-          Arrow::BooleanArray.new(booleans)
-        else
-          raise VectorTypeError, 'Not a valid type'
-        end
-      raise VectorArgumentError, 'Booleans size unmatch' if specifier.length != size
-      raise VectorArgumentError, 'Booleans not have any `true`' unless specifier.any?
-
-      r = Array(replacer) # scalar to [scalar]
-      r = [nil] if r.empty?
-
-      replacer =
-        if r.size == 1
-          case replacer
-          when Arrow::Array then replacer
-          when Vector then replacer.data
-          else
-            Arrow::Array.new(r * specifier.to_a.count(true)) # broadcast
-          end
-        else
-          Arrow::Array.new(r)
-        end
-      replacer = data.class.new(replacer) if replacer.uniq == [nil]
+    # @param boolean_mask [Arrow::BooleanArray] Boolean mask which indicates the position to be replaced.
+    #   - Position with true will be replaced.
+    #   - Position with nil will be nil.
+    #
+    # @param replacer [Arrow::Array] Values after replaced
+    #   (either scalar or array). If Array is given, original values are replaced by
+    #   each element of the array at the corresponding position of mask element.
+    #   - `replacer.size` must be equal to `mask.count(true)`.
+    #   - Types of self and replacer must be same
+    #
+    # @return [Vector] Replaced vector.
+    #   Type of returned Vector is upcasted if needed.
+    #
+    def replace_with(boolean_mask, replacer)
+      raise VectorArgumentError, 'Booleans size unmatch' if boolean_mask.length != size
+      raise VectorArgumentError, 'Booleans not have any `true`' unless boolean_mask.any?
 
-      raise VectorArgumentError, 'Replacements size unmatch' if Array(specifier).count(true) != replacer.length
+      values = replacer.class.new(data) # Upcast
 
-      values = replacer.class.new(data)
+      datum = find(:replace_with_mask).execute([values, boolean_mask, replacer])
+      Vector.new(datum.value)
+    end
 
-      datum = find('replace_with_mask').execute([values, specifier, replacer])
+    # Replace elements selected with a boolean mask by nil
+    #
+    # @param boolean_mask [Arrow::BooleanArray] Boolean mask which indicates the position to be replaced.
+    #   - Position with true will be replaced by nil
+    #   - Position with nil will remain as nil.
+    # @return [Vector] Replaced vector.
+    #
+    def replace_to_nil(boolean_mask)
+      nil_array = data.class.new([nil] * size) # Casted nil Array
+      datum = find(:if_else).execute([boolean_mask, nil_array, data])
       Vector.new(datum.value)
     end
   end

data/lib/red_amber/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RedAmber
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/red_amber.rb

@@ -3,6 +3,7 @@
 require 'arrow'
 
 require_relative 'red_amber/helper'
+require_relative 'red_amber/data_frame_combinable'
 require_relative 'red_amber/data_frame_displayable'
 require_relative 'red_amber/data_frame_indexable'
 require_relative 'red_amber/data_frame_loadsave'

data/red_amber.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'red-arrow', '>= 9.0.0'
+  spec.add_dependency 'red-arrow', '~> 10.0.0'
 
   # Development dependency has gone to the Gemfile (rubygems/bundler#7237)
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: red_amber
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Hirokazu SUZUKI (heronshoes)
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-arrow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: 10.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: 10.0.0
 description: RedAmber is a simple dataframe library inspired by Rover-df and powered
   by Red Arrow.
 email:
@@ -40,8 +40,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- benchmark/csv_load_penguins.yml
+- benchmark/basic.yml
+- benchmark/combine.yml
 - benchmark/drop_nil.yml
+- benchmark/group.yml
+- benchmark/reshape.yml
+- benchmark/rover/csv_load_penguins.yml
+- benchmark/rover/flights.yml
+- benchmark/rover/penguins.yml
+- benchmark/rover/planes.yml
+- benchmark/rover/weather.yml
 - doc/CODE_OF_CONDUCT.md
 - doc/DataFrame.md
 - doc/Vector.md
@@ -50,12 +58,14 @@ files:
 - doc/image/dataframe/assign.png
 - doc/image/dataframe/assign_operation.png
 - doc/image/dataframe/drop.png
+- doc/image/dataframe/join.png
 - doc/image/dataframe/pick.png
 - doc/image/dataframe/pick_operation.png
 - doc/image/dataframe/remove.png
 - doc/image/dataframe/rename.png
 - doc/image/dataframe/rename_operation.png
 - doc/image/dataframe/reshaping_DataFrames.png
+- doc/image/dataframe/set_and_bind.png
 - doc/image/dataframe/slice.png
 - doc/image/dataframe/slice_operation.png
 - doc/image/dataframe_model.png
@@ -76,6 +86,7 @@ files:
 - lib/red-amber.rb
 - lib/red_amber.rb
 - lib/red_amber/data_frame.rb
+- lib/red_amber/data_frame_combinable.rb
 - lib/red_amber/data_frame_displayable.rb
 - lib/red_amber/data_frame_indexable.rb
 - lib/red_amber/data_frame_loadsave.rb
@@ -99,7 +110,7 @@ metadata:
   source_code_uri: https://github.com/heronshoes/red_amber
   changelog_uri: https://github.com/heronshoes/red_amber/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -115,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Simple dataframe library for Ruby
 test_files: []