charty 0.2.0 → 0.2.1

data/lib/charty/plot_methods.rb

@@ -0,0 +1,19 @@
+module Charty
+  module PlotMethods
+    # Show the given data as rectangular bars.
+    #
+    # @param x
+    # @param y
+    # @param color
+    # @param data
+    def bar_plot(x=nil, y=nil, color=nil, **options, &block)
+      Plotters::BarPlotter.new(x, y, color, **options, &block)
+    end
+
+    def box_plot(x=nil, y=nil, color=nil, **options, &block)
+      Plotters::BoxPlotter.new(x, y, color, **options, &block)
+    end
+  end
+
+  extend PlotMethods
+end

data/lib/charty/plotter.rb

@@ -240,19 +240,19 @@ module Charty
       @backend.render(self, filename)
     end
 
-    def save(filename=nil)
-      @backend.save(self, filename)
+    def save(filename=nil, **kw)
+      @backend.save(self, filename, **kw)
     end
 
     def apply(backend)
       case
-        when !@series.empty?
-          backend.series = @series
-        when @function
-          linspace = Linspace.new(@range[:x], 100)
-          # TODO: set label with function
-          # TODO: set ys to xs when gruff curve with function
-          @series << Series.new(linspace.to_a, linspace.map{|x| @function.call(x) }, label: "function" )
+      when !@series.empty?
+        backend.series = @series
+      when @function
+        linspace = Linspace.new(@range[:x], 100)
+        # TODO: set label with function
+        # TODO: set ys to xs when gruff curve with function
+        @series << Series.new(linspace.to_a, linspace.map{|x| @function.call(x) }, label: "function" )
       end
 
       @backend = backend

data/lib/charty/plotters.rb

@@ -0,0 +1,4 @@
+require_relative "plotters/abstract_plotter"
+require_relative "plotters/categorical_plotter"
+require_relative "plotters/bar_plotter"
+require_relative "plotters/box_plotter"

data/lib/charty/plotters/abstract_plotter.rb

@@ -0,0 +1,81 @@
+module Charty
+  module Plotters
+    class AbstractPlotter
+      def initialize(x, y, color, **options)
+        self.x = x
+        self.y = y
+        self.color = color
+        self.data = data
+        self.palette = palette
+        substitute_options(options)
+        yield self if block_given?
+      end
+
+      attr_reader :x, :y, :color, :data, :palette
+
+      def x=(x)
+        @x = check_dimension(x, :x)
+      end
+
+      def y=(y)
+        @y = check_dimension(y, :y)
+      end
+
+      def color=(color)
+        # @color = check_dimension(color, :color)
+        unless color.nil?
+          raise NotImplementedError,
+                "Specifying color variable is not supported yet"
+        end
+      end
+
+      def data=(data)
+        @data = case data
+                when nil, Charty::Table
+                  data
+                else
+                  Charty::Table.new(data)
+                end
+      end
+
+      def palette=(palette)
+        @palette = case palette
+                   when nil, Charty::Palette, Symbol, String
+                     palette
+                   else
+                     raise ArgumentError,
+                       "invalid type for palette (given #{palette.class}, " +
+                       "expected Charty::Palette, Symbol, or String)"
+                   end
+      end
+
+      private def substitute_options(options)
+        options.each do |key, val|
+          send("#{key}=", val)
+        end
+      end
+
+      private def check_dimension(value, name)
+        case value
+        when nil, Symbol, String, method(:array?)
+          value
+        when ->(x) { x.respond_to?(:to_str) }
+          value.to_str
+        else
+          raise ArgumentError,
+                "invalid type of dimension for #{name} (given #{value.inspect})",
+                caller
+        end
+      end
+
+      private def array?(value)
+        TableAdapters::HashAdapter.array?(value)
+      end
+
+      def to_iruby
+        result = render
+        ["text/html", result] if result
+      end
+    end
+  end
+end

data/lib/charty/plotters/bar_plotter.rb

@@ -0,0 +1,19 @@
+module Charty
+  module Plotters
+    class BarPlotter < CategoricalPlotter
+      def render
+        backend = Backends.current
+        backend.begin_figure
+        draw_bars(backend)
+        annotate_axes(backend)
+        backend.show
+      end
+
+      private def draw_bars(backend)
+        statistic = @plot_data.map {|xs| Statistics.mean(xs) }
+        bar_pos = (0 ... statistic.length).to_a
+        backend.bar(bar_pos, statistic, color: @colors)
+      end
+    end
+  end
+end

data/lib/charty/plotters/box_plotter.rb

@@ -0,0 +1,26 @@
+module Charty
+  module Plotters
+    class BoxPlotter < CategoricalPlotter
+      def render
+        backend = Backends.current
+        backend.begin_figure
+        draw_box_plot(backend)
+        annotate_axes(backend)
+        backend.show
+      end
+
+      private def draw_box_plot(backend)
+        plot_data = @plot_data.each do |group_data|
+          next nil if group_data.empty?
+
+          group_data = Array(group_data)
+          remove_na!(group_data)
+
+          group_data
+        end
+        backend.box_plot(plot_data, (0 ... @plot_data.length).to_a,
+                         color: @colors, gray: @gray)
+      end
+    end
+  end
+end

data/lib/charty/plotters/categorical_plotter.rb

@@ -0,0 +1,148 @@
+module Charty
+  module Plotters
+    class CategoricalPlotter < AbstractPlotter
+      def initialize(x, y, color, **options, &block)
+        super
+
+        setup_variables
+        setup_colors
+      end
+
+      attr_reader :order
+
+      def order=(order)
+        @order = Array(order).map(&method(:normalize_name))
+      end
+
+      private def normalize_name(value)
+        case value
+        when String, Symbol
+          value
+        else
+          value.to_str
+        end
+      end
+
+      attr_reader :group_names, :plot_data, :group_label, :value_label
+
+      private def setup_variables
+        if x.nil? && y.nil?
+          setup_variables_with_wide_form_dataset
+        else
+          setup_variables_with_long_form_dataset
+        end
+      end
+
+      private def setup_variables_with_wide_form_dataset
+        if @color
+          raise ArgumentError,
+                "Cannot use `color` without `x` or `y`"
+        end
+
+        # No color grouping with wide inputs
+        @plot_colors = nil
+        @color_title = nil
+        @color_names = nil
+
+        # No statistical units with wide inputs
+        @plot_units = nil
+
+        @value_label = nil
+        @group_label = nil
+
+        order = @order # TODO: supply order via parameter
+        unless order
+          order = @data.column_names.select do |cn|
+            @data[cn].all? {|x| Float(x, exception: false) }
+          end
+        end
+        order ||= @data.column_names
+        @plot_data = order.map {|cn| @data[cn] }
+        @group_names = order
+      end
+
+      private def setup_variables_with_long_form_dataset
+        x, y = @x, @y
+        if @data
+          x = @data[x] || x
+          y = @data[y] || y
+        end
+
+        # Validate inputs
+        [x, y].each do |input|
+          next if array?(input)
+          raise RuntimeError,
+                "Could not interpret interpret input `#{input.inspect}`"
+        end
+
+        if x.nil? || y.nil?
+          setup_single_data
+        else
+          # FIXME: Assume vertical plot
+          groups, vals = x, y
+
+          if groups.respond_to?(:name)
+            @group_label = groups.name
+          end
+
+          if vals.respond_to?(:name)
+            @value_label = vals.name
+          end
+
+          # FIXME: Assume groups has only unique values
+          @group_names = groups
+          @plot_data = vals.map {|v| [v] }
+        end
+      end
+
+      private def setup_single_data
+        raise NotImplementedError,
+              "Single data plot is not supported yet"
+      end
+
+      private def setup_colors
+        n_colors = @plot_data.length
+        if @palette.nil?
+          current_palette = Palette.default
+          if n_colors <= current_palette.n_colors
+            palette = Palette.new(current_palette.colors, n_colors)
+          else
+            palette = Palette.husl(n_colors, l: 0.7r)
+          end
+        else
+          case @palette
+          when Hash
+            # Assume @palette has a hash table that maps
+            # group_names to colors
+            palette = @group_names.map {|gn| @palette[gn] }
+          else
+            palette = @palette
+          end
+          palette = Palette.new(palette, n_colors)
+        end
+
+        @colors = palette.colors.map {|c| c.to_rgb }
+        lightness_values = @colors.map {|c| c.to_hsl.l }
+        lum = lightness_values.min * 0.6r
+        @gray = Colors::RGB.new(lum, lum, lum)  # TODO: Use Charty::Gray
+      end
+
+      private def annotate_axes(backend)
+        backend.set_xlabel(@group_label)
+        backend.set_ylabel(@value_label)
+        backend.set_xticks((0 ... @plot_data.length).to_a)
+        backend.set_xtick_labels(@group_names)
+        backend.disable_xaxis_grid
+        backend.set_xlim(-0.5, @plot_data.length - 0.5)
+      end
+
+      private def remove_na!(ary)
+        ary.reject! do |x|
+          next true if x.nil?
+          x.respond_to?(:nan?) && x.nan?
+        end
+        ary
+      end
+    end
+  end
+end

data/lib/charty/statistics.rb

@@ -0,0 +1,29 @@
+module Charty
+  module Statistics
+    begin
+      require "enumerable/statistics"
+
+      def self.mean(enum)
+        enum.mean
+      end
+
+      def self.stdev(enum)
+        enum.stdev
+      end
+    rescue LoadError
+      def self.mean(enum)
+        xs = enum.to_a
+        xs.sum / xs.length.to_f
+      end
+
+      def self.stdev(enum, population: false)
+        xs = enum.to_a
+        n = xs.length
+        mean = xs.sum.to_f / n
+        ddof = population ? 0 : 1
+        var = xs.map {|x| (x - mean)**2 }.sum / (n - ddof)
+        Math.sqrt(var)
+      end
+    end
+  end
+end

data/lib/charty/table.rb

@@ -26,6 +26,7 @@ module Charty
     attr_reader :adapter
 
     def_delegator :@adapter, :column_names
+    def_delegator :@adapter, :data, :raw_data
 
     def columns
       @column_accessor ||= ColumnAccessor.new(@adapter)

data/lib/charty/table_adapters/active_record_adapter.rb

@@ -15,7 +15,7 @@ module Charty
         @columns = nil
       end
 
-      attr_reader :column_names
+      attr_reader :column_names, :data
 
       def [](row, column)
         fetch_records unless @columns

data/lib/charty/table_adapters/daru_adapter.rb

@@ -13,6 +13,8 @@ module Charty
         @data = check_type(Daru::DataFrame, data, :data)
       end
 
+      attr_reader :data
+
       def column_names
         @data.vectors.to_a
       end

data/lib/charty/table_adapters/datasets_adapter.rb

@@ -15,6 +15,10 @@ module Charty
         @records = []
       end
 
+      def data
+        @table
+      end
+
       def column_names
         @table.column_names
       end

data/lib/charty/table_adapters/hash_adapter.rb

@@ -61,6 +61,8 @@ module Charty
         end
       end
 
+      attr_reader :data
+
       def_delegator :@data, :keys, :column_names
 
       def [](row, column)

data/lib/charty/table_adapters/narray_adapter.rb

@@ -20,7 +20,7 @@ module Charty
         @column_names = generate_column_names(data.shape[1], columns)
       end
 
-      attr_reader :column_names
+      attr_reader :column_names, :data
 
       def [](row, column)
         if row

data/lib/charty/table_adapters/nmatrix_adapter.rb

@@ -20,7 +20,7 @@ module Charty
         @column_names = generate_column_names(data.shape[1], columns)
       end
 
-      attr_reader :column_names
+      attr_reader :column_names, :data
 
       def [](row, column)
         if row

data/lib/charty/version.rb

@@ -1,5 +1,5 @@
 module Charty
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 
   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.0
+  version: 0.2.1
 platform: ruby
 authors:
 - youchan
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: red-colors
+  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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -161,8 +175,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Dockerfile.dev
 - Gemfile
 - LICENSE
@@ -177,7 +191,9 @@ files:
 - examples/daru.ipynb
 - examples/iris_dataset.ipynb
 - examples/nmatrix.ipynb
-- examples/numo-narray.ipynb
+- examples/numo_narray.ipynb
+- examples/palette.rb
+- examples/sample.png
 - examples/sample_bokeh.ipynb
 - examples/sample_google_chart.ipynb
 - examples/sample_gruff.ipynb
@@ -211,16 +227,25 @@ files:
 - examples/sample_rubyplot.ipynb
 - images/design_concept.png
 - lib/charty.rb
+- lib/charty/backend_methods.rb
 - lib/charty/backends.rb
 - lib/charty/backends/bokeh.rb
-- lib/charty/backends/google_chart.rb
+- lib/charty/backends/google_charts.rb
 - lib/charty/backends/gruff.rb
 - lib/charty/backends/plotly.rb
 - lib/charty/backends/pyplot.rb
 - lib/charty/backends/rubyplot.rb
 - lib/charty/layout.rb
 - lib/charty/linspace.rb
+- lib/charty/palette.rb
+- lib/charty/plot_methods.rb
 - lib/charty/plotter.rb
+- lib/charty/plotters.rb
+- lib/charty/plotters/abstract_plotter.rb
+- lib/charty/plotters/bar_plotter.rb
+- lib/charty/plotters/box_plotter.rb
+- lib/charty/plotters/categorical_plotter.rb
+- lib/charty/statistics.rb
 - lib/charty/table.rb
 - lib/charty/table_adapters.rb
 - lib/charty/table_adapters/active_record_adapter.rb