charty 0.2.3 → 0.2.8

data/lib/charty/vector_adapters/numpy_adapter.rb

@@ -0,0 +1,168 @@
+module Charty
+  module VectorAdapters
+    class NumpyAdapter < BaseAdapter
+      VectorAdapters.register(:numpy, self)
+
+      def self.supported?(data)
+        return false unless defined?(Numpy::NDArray)
+        case data
+        when Numpy::NDArray
+          true
+        else
+          false
+        end
+      end
+
+      def initialize(data)
+        @data = check_data(data)
+        self.index = index || RangeIndex.new(0 ... length)
+      end
+
+      attr_reader :data
+
+      def_delegator :data, :size, :length
+
+      def compare_data_equality(other)
+        case other
+        when NumpyAdapter, PandasSeriesAdapter
+          Numpy.all(data == other.data)
+        when BaseAdapter
+          Numpy.all(data == other.data.to_a)
+        else
+          false
+        end
+      end
+
+      include NameSupport
+      include IndexSupport
+
+      def where(mask)
+        mask = check_mask_vector(mask)
+        case mask.data
+        when Numpy::NDArray,
+             ->(x) { defined?(Pandas::Series) && x.is_a?(Pandas::Series) }
+          mask_data = Numpy.asarray(mask.data, dtype: :bool)
+          masked_data = data[mask_data]
+          masked_index = mask_data.nonzero()[0].to_a.map {|i| index[i] }
+        else
+          masked_data, masked_index = where_in_array(mask)
+          masked_data = Numpy.asarray(masked_data, dtype: data.dtype)
+        end
+        Charty::Vector.new(masked_data, index: masked_index, name: name)
+      end
+
+      def each
+        return enum_for(__method__) unless block_given?
+
+        i, n = 0, data.size
+        while i < n
+          yield data[i]
+          i += 1
+        end
+      end
+
+      def empty?
+        data.size == 0
+      end
+
+      def boolean?
+        builtins = PyCall.builtins
+        case
+        when builtins.issubclass(data.dtype.type, Numpy.bool_)
+          true
+        when builtins.issubclass(data.dtype.type, Numpy.object_)
+          i, n = 0, data.size
+          while i < n
+            case data[i]
+            when nil, true, false
+              # do nothing
+            else
+              return false
+            end
+            i += 1
+          end
+          true
+        else
+          false
+        end
+      end
+
+      def numeric?
+        # TODO: Handle object array
+        PyCall.builtins.issubclass(data.dtype.type, PyCall.tuple([Numpy.number, Numpy.bool_]))
+      end
+
+      def categorical?
+        false
+      end
+
+      def categories
+        nil
+      end
+
+      def unique_values
+        Numpy.unique(data).to_a
+      end
+
+      def group_by(grouper)
+        case grouper
+        when Numpy::NDArray,
+             ->(x) { defined?(Pandas::Series) && x.is_a?(Pandas::Series) }
+          # Nothing todo
+        when Charty::Vector
+          case grouper.data
+          when Numpy::NDArray
+            grouper = grouper.data
+          else
+            grouper = Numpy.asarray(grouper.to_a)
+          end
+        else
+          grouper = Numpy.asarray(Array.try_convert(grouper))
+        end
+
+        group_keys = Numpy.unique(grouper).to_a
+        group_keys.map { |g|
+          [g, Charty::Vector.new(data[grouper == g])]
+        }.to_h
+      end
+
+      def drop_na
+        where_is_na = if numeric?
+                        Numpy.isnan(data)
+                      else
+                        (data == nil)
+                      end
+        Charty::Vector.new(data[Numpy.logical_not(where_is_na)])
+      end
+
+      def eq(val)
+        Charty::Vector.new((data == val),
+                           index: index,
+                           name: name)
+      end
+
+      def notnull
+        case
+        when PyCall.builtins.issubclass(data.dtype.type, Numpy.object_)
+          i, n = 0, length
+          notnull_data = Numpy::NDArray.new(n, dtype: :bool)
+          while i < n
+            notnull_data[i] = ! Util.missing?(data[i])
+            i += 1
+          end
+        else
+          notnull_data = Numpy.isnan(data)
+        end
+        Charty::Vector.new(notnull_data, index: index, name: name)
+      end
+
+      def mean
+        Numpy.mean(data)
+      end
+
+      def stdev(population: false)
+        Numpy.std(data, ddof: population ? 0 : 1)
+      end
+    end
+  end
+end

data/lib/charty/vector_adapters/pandas_adapter.rb

@@ -0,0 +1,199 @@
+module Charty
+  module VectorAdapters
+    class PandasSeriesAdapter < BaseAdapter
+      VectorAdapters.register(:pandas_series, self)
+
+      def self.supported?(data)
+        return false unless defined?(Pandas::Series)
+        case data
+        when Pandas::Series
+          true
+        else
+          false
+        end
+      end
+
+      def initialize(data)
+        @data = check_data(data)
+      end
+
+      attr_reader :data
+
+      def_delegator :data, :size, :length
+
+      def index
+        PandasIndex.new(data.index)
+      end
+
+      def index=(new_index)
+        case new_index
+        when PandasIndex
+          data.index = new_index.values
+        when Index
+          data.index = new_index.to_a
+        else
+          data.index = new_index
+        end
+      end
+
+      def_delegators :data, :name, :name=
+
+      def compare_data_equality(other)
+        case other
+        when PandasSeriesAdapter
+          return data.equals(other.data)
+        when NumpyAdapter
+          other = other.data
+        when NArrayAdapter
+          case other.data
+          when Numo::Bit
+            other = other.data.to_a
+            other.map! {|x| [false, true][x] }
+          else
+            other = other.data.to_a
+          end
+        when BaseAdapter
+          other = other.data.to_a
+        else
+          return false
+        end
+
+        data.equals(Pandas::Series.new(other, index: data.index))
+      end
+
+      def [](key)
+        case key
+        when Charty::Vector
+          where(key)
+        else
+          data[key]
+        end
+      end
+
+      def_delegators :data, :[]=, :to_a
+
+      def each
+        return enum_for(__method__) unless block_given?
+
+        i, n = 0, data.size
+        while i < n
+          yield data.iloc[i]
+          i += 1
+        end
+      end
+
+      def empty?
+        data.size == 0
+      end
+
+      def values_at(*indices)
+        data.take(indices).to_a
+      end
+
+      def where(mask)
+        mask = check_mask_vector(mask)
+        case mask.data
+        when Numpy::NDArray,
+             ->(x) { defined?(Pandas::Series) && x.is_a?(Pandas::Series) }
+          mask_data = Numpy.asarray(mask.data, dtype: :bool)
+          masked_data = data[mask_data]
+          masked_index = mask_data.nonzero()[0].to_a.map {|i| index[i] }
+        else
+          masked_data, masked_index = where_in_array(mask)
+          masked_data = Pandas::Series.new(masked_data, dtype: data.dtype)
+        end
+        Charty::Vector.new(masked_data, index: masked_index, name: name)
+      end
+
+      def where_in_array(mask)
+        mask = check_mask_vector(mask)
+        masked_data = []
+        masked_index = []
+        mask.each_with_index do |f, i|
+          case f
+          when true, 1
+            masked_data << data.iloc[i]
+            masked_index << index[i]
+          end
+        end
+        return masked_data, masked_index
+      end
+
+      def boolean?
+        case
+        when Pandas.api.types.is_bool_dtype(data.dtype)
+          true
+        when Pandas.api.types.is_object_dtype(data.dtype)
+          data.isin([nil, false, true]).all()
+        else
+          false
+        end
+      end
+
+      def numeric?
+        Pandas.api.types.is_numeric_dtype(data.dtype)
+      end
+
+      def categorical?
+        Pandas.api.types.is_categorical_dtype(data.dtype)
+      end
+
+      def categories
+        data.cat.categories.to_a if categorical?
+      end
+
+      def unique_values
+        data.unique.to_a
+      end
+
+      def group_by(grouper)
+        case grouper
+        when Pandas::Series
+          group_keys = grouper.unique.to_a
+          groups = data.groupby(grouper)
+          group_keys.map {|g|
+            [g, Charty::Vector.new(groups.get_group(g))]
+          }.to_h
+        when Charty::Vector
+          case grouper.adapter
+          when self.class
+            group_by(grouper.data)
+          else
+            grouper = Pandas::Series.new(grouper.to_a)
+            group_by(grouper)
+          end
+        else
+          grouper = Pandas::Series.new(Array(grouper))
+          group_by(grouper)
+        end
+      end
+
+      def drop_na
+        Charty::Vector.new(data.dropna)
+      end
+
+      def eq(val)
+        Charty::Vector.new((data == val),
+                           index: index,
+                           name: name)
+      end
+
+      def notnull
+        Charty::Vector.new(data.notnull, index: index, name: name)
+      end
+
+      def mean
+        data.mean()
+      end
+
+      def stdev(population: false)
+        data.std(ddof: population ? 0 : 1)
+      end
+
+      def percentile(q)
+        q = q.map {|x| x / 100.0 }
+        data.quantile(q)
+      end
+    end
+  end
+end

data/lib/charty/version.rb

@@ -1,5 +1,5 @@
 module Charty
-  VERSION = "0.2.3"
+  VERSION = "0.2.8"
 
   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.3
+  version: 0.2.8
 platform: ruby
 authors:
 - youchan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-05 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-colors
@@ -18,50 +18,78 @@ 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.2.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: matplotlib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+        version: 1.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  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: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -69,21 +97,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: numo-narray
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -97,7 +125,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nmatrix
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,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:
     - - ">="
@@ -167,19 +195,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: matplotlib
+  name: iruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 description: Visualizing your data in a simple way.
 email:
 - youchan01@gmail.com
@@ -190,6 +218,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
+- ".github/workflows/nmatrix.yml"
+- ".github/workflows/pycall.yml"
 - ".gitignore"
 - Dockerfile.dev
 - Gemfile
@@ -230,6 +260,7 @@ files:
 - examples/sample_images/curve_with_function_pyplot.png
 - examples/sample_images/curve_with_function_rubyplot.png
 - examples/sample_images/error_bar_pyplot.png
+- examples/sample_images/hist_gruff.png
 - examples/sample_images/hist_pyplot.png
 - examples/sample_images/scatter_bokeh.html
 - examples/sample_images/scatter_gruff.png
@@ -240,6 +271,15 @@ files:
 - examples/sample_pyplot.ipynb
 - examples/sample_rubyplot.ipynb
 - images/design_concept.png
+- images/penguins_body_mass_g_flipper_length_mm_scatter_plot.png
+- images/penguins_body_mass_g_flipper_length_mm_species_scatter_plot.png
+- images/penguins_body_mass_g_flipper_length_mm_species_sex_scatter_plot.png
+- images/penguins_species_body_mass_g_bar_plot_h.png
+- images/penguins_species_body_mass_g_bar_plot_v.png
+- images/penguins_species_body_mass_g_box_plot_h.png
+- images/penguins_species_body_mass_g_box_plot_v.png
+- images/penguins_species_body_mass_g_sex_bar_plot_v.png
+- images/penguins_species_body_mass_g_sex_box_plot_v.png
 - lib/charty.rb
 - lib/charty/backend_methods.rb
 - lib/charty/backends.rb
@@ -247,9 +287,16 @@ 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/plot_methods.rb
@@ -259,15 +306,35 @@ files:
 - lib/charty/plotters/bar_plotter.rb
 - 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
+- lib/charty/plotters/vector_plotter.rb
 - lib/charty/statistics.rb
 - lib/charty/table.rb
 - lib/charty/table_adapters.rb
 - lib/charty/table_adapters/active_record_adapter.rb
+- lib/charty/table_adapters/base_adapter.rb
 - lib/charty/table_adapters/daru_adapter.rb
 - lib/charty/table_adapters/datasets_adapter.rb
 - lib/charty/table_adapters/hash_adapter.rb
 - 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
+- lib/charty/vector_adapters/daru_adapter.rb
+- lib/charty/vector_adapters/narray_adapter.rb
+- lib/charty/vector_adapters/nmatrix_adapter.rb
+- lib/charty/vector_adapters/numpy_adapter.rb
+- lib/charty/vector_adapters/pandas_adapter.rb
 - lib/charty/version.rb
 homepage: https://github.com/red-data-tools/charty
 licenses:
@@ -288,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Visualizing your data in a simple way.