charty 0.2.4 → 0.2.9

data/lib/charty/table_adapters/pandas_adapter.rb

@@ -21,6 +21,10 @@ module Charty
 
       attr_reader :data
 
+      def length
+        data.shape[0]
+      end
+
       def columns
         PandasIndex.new(data.columns)
       end
@@ -29,8 +33,10 @@ module Charty
         case new_columns
         when PandasIndex
           data.columns = new_columns.values
+          data.columns.name = new_columns.name
         when Index
           data.columns = new_columns.to_a
+          data.columns.name = new_columns.name
         else
           data.columns = new_columns
         end
@@ -44,8 +50,10 @@ module Charty
         case new_index
         when PandasIndex
           data.index = new_index.values
+          data.index.name = new_index.name
         when Index
           data.index = new_index.to_a
+          data.index.name = new_index.name
         else
           data.index = new_index
         end
@@ -72,10 +80,84 @@ module Charty
         end
       end
 
+      def drop_na
+        Charty::Table.new(@data.dropna)
+      end
+
+      def sort_values(by, na_position: :last)
+        Charty::Table.new(@data.sort_values(by, na_position: na_position, kind: :mergesort))
+      end
+
       private def check_type(type, data, name)
         return data if data.is_a?(type)
         raise TypeError, "#{name} must be a #{type}"
       end
+
+      def group_by(_table, grouper, sort, drop_na)
+        GroupBy.new(@data.groupby(by: grouper, sort: sort, dropna: drop_na))
+      end
+
+      def reset_index
+        Charty::Table.new(data.reset_index)
+      end
+
+      class GroupBy < Charty::Table::GroupByBase
+        def initialize(groupby)
+          @groupby = groupby
+        end
+
+        def indices
+          @groupby.indices.map { |k, v|
+            [k, v.to_a]
+          }.to_h
+        end
+
+        def group_keys
+          each_group_key.to_a
+        end
+
+        def each_group_key
+          return enum_for(__method__) unless block_given?
+
+          if PyCall.respond_to?(:iterable)
+            PyCall.iterable(@groupby).each do |key, index|
+              if key.class == PyCall.builtins.tuple
+                key = key.to_a
+              end
+              yield key
+            end
+          else # TODO: Remove this clause after the new PyCall will be released
+            iter = @groupby.__iter__()
+            while true
+              begin
+                key, sub_data = iter.__next__
+                if key.class == PyCall.builtins.tuple
+                  key = key.to_a
+                end
+                yield key
+              rescue PyCall::PyError => error
+                if error.type == PyCall.builtins.StopIteration
+                  break
+                else
+                  raise error
+                end
+              end
+            end
+          end
+        end
+
+        def apply(*args, &block)
+          res = @groupby.apply(->(data) {
+            res = block.call(Charty::Table.new(data), *args)
+            Pandas::Series.new(data: res)
+          })
+          Charty::Table.new(res)
+        end
+
+        def [](key)
+          Charty::Table.new(@groupby.get_group(key))
+        end
+      end
     end
   end
 end

data/lib/charty/util.rb

@@ -0,0 +1,28 @@
+module Charty
+  module Util
+    if [].respond_to?(:filter_map)
+      module_function def filter_map(enum, &block)
+        enum.filter_map(&block)
+      end
+    else
+      module_function def filter_map(enum, &block)
+        enum.inject([]) do |acc, x|
+          y = block.call(x)
+          if y
+            acc.push(y)
+          else
+            acc
+          end
+        end
+      end
+    end
+
+    module_function def missing?(val)
+      val.nil? || nan?(val)
+    end
+
+    module_function def nan?(val)
+      val.respond_to?(:nan?) && val.nan?
+    end
+  end
+end

data/lib/charty/vector_adapters.rb

@@ -22,7 +22,6 @@ module Charty
     class BaseAdapter
       extend Forwardable
       include Enumerable
-      include MissingValueSupport
 
       def self.adapter_name
         name[/:?(\w+)Adapter\z/, 1]
@@ -61,6 +60,11 @@ module Charty
       def_delegators :data, :[], :[]=
       def_delegators :data, :each, :to_a, :empty?
 
+      # Take values at the given positional indices (without indexing)
+      def values_at(*indices)
+        indices.map {|i| data[i] }
+      end
+
       def where_in_array(mask)
         mask = check_mask_vector(mask)
         masked_data = []

data/lib/charty/vector_adapters/array_adapter.rb

@@ -30,7 +30,6 @@ module Charty
       include NameSupport
       include IndexSupport
 
-      # TODO: Reconsider the return value type of values_at
       def_delegators :data, :values_at
 
       def where(mask)
@@ -80,14 +79,7 @@ module Charty
 
       def drop_na
         if numeric?
-          Charty::Vector.new(data.reject { |x|
-            case x
-            when Float
-              x.nan?
-            else
-              x.nil?
-            end
-          })
+          Charty::Vector.new(data.reject { |x| Util.missing?(x) })
         else
           Charty::Vector.new(data.compact)
         end
@@ -100,7 +92,7 @@ module Charty
       end
 
       def notnull
-        Charty::Vector.new(data.map {|x| ! missing_value?(x) },
+        Charty::Vector.new(data.map {|x| ! Util.missing?(x) },
                            index: index,
                            name: name)
       end

data/lib/charty/vector_adapters/daru_adapter.rb

@@ -55,7 +55,7 @@ module Charty
       def_delegators :data, :[]=, :to_a
 
       def values_at(*indices)
-        indices.map {|i| data[i] }
+        indices.map {|i| data.at(i) }
       end
 
       def where(mask)
@@ -130,15 +130,7 @@ module Charty
       end
 
       def drop_na
-        values = data.reject do |x|
-          case
-          when x.nil?,
-               x.respond_to?(:nan?) && x.nan?
-            true
-          else
-            false
-          end
-        end
+        values = data.reject {|x| Util.missing?(x) }
         Charty::Vector.new(Daru::Vector.new(values))
       end
 
@@ -149,7 +141,7 @@ module Charty
       end
 
       def notnull
-        notnull_data = data.map {|x| ! missing_value?(x) }
+        notnull_data = data.map {|x| ! Util.missing?(x) }
         Charty::Vector.new(notnull_data, index: data.index.to_a, name: name)
       end
 

data/lib/charty/vector_adapters/narray_adapter.rb

@@ -29,11 +29,6 @@ module Charty
       include NameSupport
       include IndexSupport
 
-      # TODO: Reconsider the return value type of values_at
-      def values_at(*indices)
-        data[indices].to_a
-      end
-
       def where(mask)
         mask = check_mask_vector(mask)
         case mask.data
@@ -157,7 +152,7 @@ module Charty
           i, n = 0, length
           notnull_data = Numo::Bit.zeros(n)
           while i < n
-            notnull_data[i] = ! missing_value?(data[i])
+            notnull_data[i] = ! Util.missing?(data[i])
             i += 1
           end
         when ->(x) { x.respond_to?(:isnan) }

data/lib/charty/vector_adapters/numpy_adapter.rb

@@ -147,7 +147,7 @@ module Charty
           i, n = 0, length
           notnull_data = Numpy::NDArray.new(n, dtype: :bool)
           while i < n
-            notnull_data[i] = ! missing_value?(data[i])
+            notnull_data[i] = ! Util.missing?(data[i])
             i += 1
           end
         else

data/lib/charty/vector_adapters/pandas_adapter.rb

@@ -86,7 +86,6 @@ module Charty
         data.size == 0
       end
 
-      # TODO: Reconsider the return value type of values_at
       def values_at(*indices)
         data.take(indices).to_a
       end

data/lib/charty/version.rb

@@ -1,5 +1,5 @@
 module Charty
-  VERSION = "0.2.4"
+  VERSION = "0.2.9"
 
   module Version
     numbers, TAG = VERSION.split("-")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charty
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.9
 platform: ruby
 authors:
 - youchan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-colors
@@ -18,28 +18,84 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: red-datasets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: red-palette
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: matplotlib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: pandas
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
+- !ruby/object:Gem::Dependency
+  name: playwright-ruby-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -83,21 +139,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: red-datasets
+  name: daru
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: daru
+  name: matrix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,6 +194,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: iruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Visualizing your data in a simple way.
 email:
 - youchan01@gmail.com
@@ -217,13 +301,18 @@ files:
 - lib/charty/backends/google_charts.rb
 - lib/charty/backends/gruff.rb
 - lib/charty/backends/plotly.rb
+- lib/charty/backends/plotly_helpers/html_renderer.rb
+- lib/charty/backends/plotly_helpers/notebook_renderer.rb
+- lib/charty/backends/plotly_helpers/plotly_renderer.rb
 - lib/charty/backends/pyplot.rb
 - lib/charty/backends/rubyplot.rb
 - lib/charty/backends/unicode_plot.rb
+- lib/charty/cache_dir.rb
+- lib/charty/dash_pattern_generator.rb
 - lib/charty/index.rb
+- lib/charty/iruby_helper.rb
 - lib/charty/layout.rb
 - lib/charty/linspace.rb
-- lib/charty/missing_value_support.rb
 - lib/charty/plot_methods.rb
 - lib/charty/plotter.rb
 - lib/charty/plotters.rb
@@ -232,7 +321,10 @@ files:
 - lib/charty/plotters/box_plotter.rb
 - lib/charty/plotters/categorical_plotter.rb
 - lib/charty/plotters/count_plotter.rb
+- lib/charty/plotters/distribution_plotter.rb
 - lib/charty/plotters/estimation_support.rb
+- lib/charty/plotters/histogram_plotter.rb
+- lib/charty/plotters/line_plotter.rb
 - lib/charty/plotters/random_support.rb
 - lib/charty/plotters/relational_plotter.rb
 - lib/charty/plotters/scatter_plotter.rb
@@ -248,6 +340,7 @@ files:
 - lib/charty/table_adapters/narray_adapter.rb
 - lib/charty/table_adapters/nmatrix_adapter.rb
 - lib/charty/table_adapters/pandas_adapter.rb
+- lib/charty/util.rb
 - lib/charty/vector.rb
 - lib/charty/vector_adapters.rb
 - lib/charty/vector_adapters/array_adapter.rb