charty 0.1.4.dev → 0.1.5.dev

data/examples/sample_pyplot.ipynb

@@ -2,16 +2,16 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "[:inline, \"module://matplotlib.backends.backend_inline\"]"
+       "[:inline, \"module://ruby.matplotlib.backend_inline\"]"
       ]
      },
-     "execution_count": 1,
+     "execution_count": 15,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -20,7 +20,7 @@
     "require 'charty'\n",
     "\n",
     "charty = Charty::Plotter.new(:pyplot)\n",
-    "Charty::Matplot.activate_iruby_integration"
+    "Charty::PyPlot.activate_iruby_integration"
    ]
   },
   {
@@ -200,16 +200,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "#<Charty::Layout:0x00007f89d6291870 @frontend=#<Charty::Matplot:0x00007f89d713e580 @plot=<module 'matplotlib.pyplot' from '/usr/local/opt/python/Frameworks/Python.framework/Versions/3.7/lib/python3.7/site-packages/matplotlib/pyplot.py'>, @series=[#<struct Charty::Series xs=0..10, ys=#<Enumerator: 0..1:step(0.1)>, zs=nil, xerr=nil, yerr=nil, label=\"sample1\">, #<struct Charty::Series xs=0..5, ys=#<Enumerator: 0..1:step(0.2)>, zs=nil, xerr=nil, yerr=nil, label=\"sample2\">, #<struct Charty::Series xs=[0, 1, 2, 3, 4], ys=[0, -0.1, -0.5, -0.5, 0.1], zs=nil, xerr=nil, yerr=nil, label=nil>]>, @layout=#<Charty::ArrayLayout:0x00007f89d62917f8 @array=[], @direction=:horizontal>>"
+       "#<Charty::Layout:0x000055f440ba50d8 @frontend=#<Charty::PyPlot:0x000055f440b766c0 @plot=<module 'matplotlib.pyplot' from '/opt/conda/lib/python3.7/site-packages/matplotlib/pyplot.py'>>, @layout=#<Charty::ArrayLayout:0x000055f440ba50b0 @array=[], @direction=:horizontal>>"
       ]
      },
-     "execution_count": 8,
+     "execution_count": 16,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -376,7 +376,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Ruby 2.5.0",
+   "display_name": "Ruby 2.6.2",
    "language": "ruby",
    "name": "ruby"
   },
@@ -384,7 +384,7 @@
    "file_extension": ".rb",
    "mimetype": "application/x-ruby",
    "name": "ruby",
-   "version": "2.5.0"
+   "version": "2.6.2"
   },
   "toc": {
    "nav_menu": {},

data/lib/charty.rb

@@ -5,9 +5,3 @@ require_relative "charty/plotter_adapter"
 require_relative "charty/layout"
 require_relative "charty/linspace"
 require_relative "charty/table"
-
-module Charty
-  def self.new(*args)
-    Charty::Plotter.new(*args)
-  end
-end

data/lib/charty/backends/bokeh.rb

@@ -0,0 +1,74 @@
+require 'pycall'
+
+module Charty
+  class Bokeh < PlotterAdapter
+    Name = "bokeh"
+
+    def initialize
+      @plot = PyCall.import_module('bokeh.plotting')
+    end
+
+    def series=(series)
+      @series = series
+    end
+
+    def render(context, filename)
+      plot = plot(context)
+      save(plot, context, filename)
+      PyCall.import_module('bokeh.io').show(plot)
+    end
+
+    def save(plot, context, filename)
+      if filename
+        PyCall.import_module('bokeh.io').save(plot, filename)
+      end
+    end
+
+    def plot(context)
+      #TODO To implement boxplot, bublle, error_bar, hist.
+
+      plot = @plot.figure(title: context&.title)
+      plot.xaxis[0].axis_label = context&.xlabel
+      plot.yaxis[0].axis_label = context&.ylabel
+
+      case context.method
+        when :bar
+          context.series.each do |data|
+            diffs = data.xs.to_a.each_cons(2).map {|n, m| (n - m).abs }
+            width = diffs.min * 0.8
+            plot.vbar(data.xs.to_a, width, data.ys.to_a)
+          end
+
+        when :barh
+          context.series.each do |data|
+            diffs = data.xs.to_a.each_cons(2).map {|n, m| (n - m).abs }
+            height = diffs.min * 0.8
+            plot.hbar(data.xs.to_a, height, data.ys.to_a)
+          end
+
+        when :boxplot
+          raise NotImplementedError
+
+        when :bubble
+          raise NotImplementedError
+
+        when :curve
+          context.series.each do |data|
+            plot.line(data.xs.to_a, data.ys.to_a)
+          end
+
+        when :scatter
+          context.series.each do |data|
+            plot.scatter(data.xs.to_a, data.ys.to_a)
+          end
+
+        when :error_bar
+          raise NotImplementedError
+
+        when :hist
+          raise NotImplementedError
+        end
+      plot
+    end
+  end
+end

data/lib/charty/backends/gruff.rb

@@ -45,8 +45,26 @@ module Charty
         end
         p
       when :barh
-        # TODO: To implement
-        raise NotImplementedError
+        p = plot::SideBar.new
+        p.title = context.title if context.title
+        p.x_axis_label = context.xlabel if context.xlabel
+        p.y_axis_label = context.ylabel if context.ylabel
+        labels = context.series.map {|data| data.xs.to_a}.flatten.uniq
+        labels.each do |label|
+          data_ys = context.series.map do |data|
+            if data.xs.to_a.index(label)
+              data.ys.to_a[data.xs.to_a.index(label)]
+            else
+              0
+            end
+          end
+          p.data(label, data_ys)
+        end
+        p.labels = context.series.each_with_index.inject({}) do |attr, (data, i)|
+          attr[i] = data.label
+          attr
+        end
+        p
       when :box_plot
         # refs. https://github.com/topfunky/gruff/issues/155
         raise NotImplementedError

data/lib/charty/backends/pyplot.rb

@@ -40,6 +40,14 @@ module Charty
       @plot.show
     end
 
+    def save(context, filename)
+      plot(@plot, context)
+      if filename
+        FileUtils.mkdir_p(File.dirname(filename))
+        @plot.savefig(filename)
+      end
+    end
+
     def plot(plot, context, subplot: false)
       # TODO: Since it is not required, research and change conditions.
       # case
@@ -68,7 +76,7 @@ module Charty
           plot.barh(data.xs.to_a.map(&:to_s), data.ys.to_a)
         end
       when :box_plot
-        plot.boxplot(context.data.to_a)
+        plot.boxplot(context.data.to_a, labels: context.labels)
       when :bubble
         context.series.each do |data|
           plot.scatter(data.xs.to_a, data.ys.to_a, s: data.zs.to_a, alpha: 0.5, label: data.label)

data/lib/charty/plotter.rb

@@ -155,14 +155,14 @@ module Charty
   Series = Struct.new(:xs, :ys, :zs, :xerr, :yerr, :label)
 
   class RenderContext
-    attr_reader :function, :range, :series, :method, :data, :title, :xlabel, :ylabel
+    attr_reader :function, :range, :series, :method, :data, :title, :xlabel, :ylabel, :labels
 
     def initialize(method, **args, &block)
       @method = method
       configurator = Configurator.new(**args)
       configurator.instance_eval &block
       # TODO: label も外から付けられた方がよさそう
-      (@range, @series, @function, @data, @title, @xlabel, @ylabel) = configurator.to_a
+      (@range, @series, @function, @data, @title, @xlabel, @ylabel, @labels) = configurator.to_a
     end
 
     class Configurator
@@ -191,6 +191,10 @@ module Charty
         @ylabel = ylabel
       end
 
+      def labels(labels)
+        @labels = labels
+      end
+
       def label(x, y)
 
       end
@@ -204,7 +208,7 @@ module Charty
       end
 
       def to_a
-        [@range, @series, @function, @data, @title, @xlabel, @ylabel]
+        [@range, @series, @function, @data, @title, @xlabel, @ylabel, @labels]
       end
 
       def method_missing(method, *args)
@@ -228,6 +232,10 @@ module Charty
       @plotter_adapter.render(self, filename)
     end
 
+    def save(filename=nil)
+      @plotter_adapter.save(self, filename)
+    end
+
     def apply(plotter_adapter)
       case
         when !@series.empty?

data/lib/charty/table.rb

@@ -23,6 +23,8 @@ module Charty
         else
           raise ArgumentError, "column_names is required to convert to_a from ActiveRecord::Relation"
         end
+      when table.kind_of?(Array)
+        table
       else
         raise ArgumentError, "unsupported object: #{table.inspect}"
       end

data/lib/charty/version.rb

@@ -1,5 +1,5 @@
 module Charty
-  VERSION = "0.1.4-dev"
+  VERSION = "0.1.5-dev"
 
   module Version
     numbers, TAG = VERSION.split("-")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charty
 version: !ruby/object:Gem::Version
-  version: 0.1.4.dev
+  version: 0.1.5.dev
 platform: ruby
 authors:
 - youchan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,20 +68,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: gruff
-  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
@@ -113,8 +99,9 @@ files:
 - examples/sample_images/bar_gruff.png
 - examples/sample_images/bar_pyplot.png
 - examples/sample_images/bar_rubyplot.png
+- examples/sample_images/barh_gruff.png
 - examples/sample_images/barh_pyplot.png
-- examples/sample_images/boxplot_pyplot.png
+- examples/sample_images/box_plot_pyplot.png
 - examples/sample_images/bubble_pyplot.png
 - examples/sample_images/bubble_rubyplot.png
 - examples/sample_images/curve_gruff.png
@@ -122,7 +109,7 @@ files:
 - examples/sample_images/curve_rubyplot.png
 - examples/sample_images/curve_with_function_pyplot.png
 - examples/sample_images/curve_with_function_rubyplot.png
-- examples/sample_images/errorbar_pyplot.png
+- examples/sample_images/error_bar_pyplot.png
 - examples/sample_images/hist_pyplot.png
 - examples/sample_images/scatter_gruff.png
 - examples/sample_images/scatter_pyplot.png
@@ -133,6 +120,7 @@ files:
 - examples/sample_rubyplot.ipynb
 - images/design_concept.png
 - lib/charty.rb
+- lib/charty/backends/bokeh.rb
 - lib/charty/backends/google_chart.rb
 - lib/charty/backends/gruff.rb
 - lib/charty/backends/pyplot.rb