charty 0.1.5.dev → 0.2.0

data/lib/charty/backends/rubyplot.rb

@@ -1,94 +1,102 @@
-require 'rubyplot'
+require 'fileutils'
 
 module Charty
-  class Rubyplot < PlotterAdapter
-    Name = "rubyplot"
+  module Backends
+    class Rubyplot
+      Backends.register(:rubyplot, self)
 
-    def initialize
-      @plot = ::Rubyplot
-    end
+      class << self
+        def prepare
+          require 'rubyplot'
+        end
+      end
 
-    def label(x, y)
-    end
+      def initialize
+        @plot = ::Rubyplot
+      end
 
-    def series=(series)
-      @series = series
-    end
+      def label(x, y)
+      end
+
+      def series=(series)
+        @series = series
+      end
 
-    def render_layout(layout)
-      (fig, axes) = *@plot.subplots(nrows: layout.num_rows, ncols: layout.num_cols)
-      layout.rows.each_with_index do |row, y|
-        row.each_with_index do |cel, x|
-          plot = layout.num_rows > 1 ? axes[y][x] : axes[x]
-          plot(plot, cel)
+      def render_layout(layout)
+        (fig, axes) = *@plot.subplots(nrows: layout.num_rows, ncols: layout.num_cols)
+        layout.rows.each_with_index do |row, y|
+          row.each_with_index do |cel, x|
+            plot = layout.num_rows > 1 ? axes[y][x] : axes[x]
+            plot(plot, cel)
+          end
         end
+        @plot.show
       end
-      @plot.show
-    end
 
-    def render(context, filename="")
-      FileUtils.mkdir_p(File.dirname(filename))
-      plot(@plot, context).write(filename)
-    end
+      def render(context, filename="")
+        FileUtils.mkdir_p(File.dirname(filename))
+        plot(@plot, context).write(filename)
+      end
 
-    def plot(plot, context)
-      # case
-      # when plot.respond_to?(:xlim)
-      #   plot.xlim(context.range_x.begin, context.range_x.end)
-      #   plot.ylim(context.range_y.begin, context.range_y.end)
-      # when plot.respond_to?(:set_xlim)
-      #   plot.set_xlim(context.range_x.begin, context.range_x.end)
-      #   plot.set_ylim(context.range_y.begin, context.range_y.end)
-      # end
+      def plot(plot, context)
+        # case
+        # when plot.respond_to?(:xlim)
+        #   plot.xlim(context.range_x.begin, context.range_x.end)
+        #   plot.ylim(context.range_y.begin, context.range_y.end)
+        # when plot.respond_to?(:set_xlim)
+        #   plot.set_xlim(context.range_x.begin, context.range_x.end)
+        #   plot.set_ylim(context.range_y.begin, context.range_y.end)
+        # end
 
-      figure = ::Rubyplot::Figure.new
-      axes = figure.add_subplot 0,0
-      axes.title = context.title if context.title
-      axes.x_title = context.xlabel if context.xlabel
-      axes.y_title = context.ylabel if context.ylabel
+        figure = ::Rubyplot::Figure.new
+        axes = figure.add_subplot 0,0
+        axes.title = context.title if context.title
+        axes.x_title = context.xlabel if context.xlabel
+        axes.y_title = context.ylabel if context.ylabel
 
-      case context.method
-      when :bar
-        context.series.each do |data|
-          axes.bar! do |p|
-            p.data(data.xs.to_a)
-            p.label = data.label
+        case context.method
+        when :bar
+          context.series.each do |data|
+            axes.bar! do |p|
+              p.data(data.xs.to_a)
+              p.label = data.label
+            end
           end
-        end
-        figure
-      when :barh
-        raise NotImplementedError
-      when :box_plot
-        raise NotImplementedError
-      when :bubble
-        context.series.each do |data|
-          axes.bubble! do |p|
-            p.data(data.xs.to_a, data.ys.to_a, data.zs.to_a)
-            p.label = data.label if data.label
+          figure
+        when :barh
+          raise NotImplementedError
+        when :box_plot
+          raise NotImplementedError
+        when :bubble
+          context.series.each do |data|
+            axes.bubble! do |p|
+              p.data(data.xs.to_a, data.ys.to_a, data.zs.to_a)
+              p.label = data.label if data.label
+            end
           end
-        end
-        figure
-      when :curve
-        context.series.each do |data|
-          axes.line! do |p|
-            p.data(data.xs.to_a, data.ys.to_a)
-            p.label = data.label if data.label
+          figure
+        when :curve
+          context.series.each do |data|
+            axes.line! do |p|
+              p.data(data.xs.to_a, data.ys.to_a)
+              p.label = data.label if data.label
+            end
           end
-        end
-        figure
-      when :scatter
-        context.series.each do |data|
-          axes.scatter! do |p|
-            p.data(data.xs.to_a, data.ys.to_a)
-            p.label = data.label if data.label
+          figure
+        when :scatter
+          context.series.each do |data|
+            axes.scatter! do |p|
+              p.data(data.xs.to_a, data.ys.to_a)
+              p.label = data.label if data.label
+            end
           end
+          figure
+        when :error_bar
+          # refs. https://github.com/SciRuby/rubyplot/issues/26
+          raise NotImplementedError
+        when :hist
+          raise NotImplementedError
         end
-        figure
-      when :error_bar
-        # refs. https://github.com/SciRuby/rubyplot/issues/26
-        raise NotImplementedError
-      when :hist
-        raise NotImplementedError
       end
     end
   end

data/lib/charty/plotter.rb

@@ -1,7 +1,8 @@
 module Charty
   class Plotter
-    def initialize(adapter_name)
-      @plotter_adapter =  PlotterAdapter.create(adapter_name)
+    def initialize(backend_name)
+      backend_class = Backends.find_backend_class(backend_name)
+      @backend = backend_class.new
     end
 
     def table=(data, **kwargs)
@@ -11,10 +12,11 @@ module Charty
     attr_reader :table
 
     def to_bar(x, y, **args, &block)
-      seriesx, seriesy = *table.to_a(x, y)
+      seriesx = table[x]
+      seriesy = table[y]
       xrange = (seriesx.min)..(seriesx.max)
       yrange = (seriesy.min)..(seriesy.max)
-      bar = bar do
+      bar do
         series seriesx, seriesy
         range x: xrange, y: yrange
         xlabel x
@@ -23,10 +25,11 @@ module Charty
     end
 
     def to_barh(x, y, **args, &block)
-      seriesx, seriesy = *table.to_a(x, y)
+      seriesx = table[x]
+      seriesy = table[y]
       xrange = (seriesx.min)..(seriesx.max)
       yrange = (seriesy.min)..(seriesy.max)
-      bar = barh do
+      barh do
         series seriesx, seriesy
         range x: xrange, y: yrange
         xlabel x
@@ -35,10 +38,10 @@ module Charty
     end
 
     def to_box_plot(x, y, **args, &block)
-      serieses = table.to_a(x, y)
+      serieses = [table[x], table[y]]
       xrange = 0..serieses.size
       yrange = (serieses.flatten.min - 1)..(serieses.flatten.max + 1)
-      box_plot = box_plot do
+      box_plot do
         data serieses
         range x: xrange, y: yrange
         xlabel x
@@ -47,10 +50,12 @@ module Charty
     end
 
     def to_bubble(x, y, z, **args, &block)
-      seriesx, seriesy, seriesz = *table.to_a(x, y, z)
+      seriesx = table[x]
+      seriesy = table[y]
+      seriesz = table[z]
       xrange = (seriesx.min)..(seriesx.max)
       yrange = (seriesy.min)..(seriesy.max)
-      bubble = bubble do
+      bubble do
         series seriesx, seriesy, seriesz
         range x: xrange, y: yrange
         xlabel x
@@ -59,10 +64,11 @@ module Charty
     end
 
     def to_curve(x, y, **args, &block)
-      seriesx, seriesy = *table.to_a(x, y)
+      seriesx = table[x]
+      seriesy = table[y]
       xrange = (seriesx.min)..(seriesx.max)
       yrange = (seriesy.min)..(seriesy.max)
-      curve = curve do
+      curve do
         series seriesx, seriesy
         range x: xrange, y: yrange
         xlabel x
@@ -71,10 +77,11 @@ module Charty
     end
 
     def to_scatter(x, y, **args, &block)
-      seriesx, seriesy = *table.to_a(x, y)
+      seriesx = table[x]
+      seriesy = table[y]
       xrange = (seriesx.min)..(seriesx.max)
       yrange = (seriesy.min)..(seriesy.max)
-      scatter = scatter do
+      scatter do
         series seriesx, seriesy
         range x: xrange, y: yrange
         xlabel x
@@ -84,10 +91,11 @@ module Charty
 
     def to_error_bar(x, y, **args, &block)
       # TODO: It is not yet decided how to include data including xerror and yerror.
-      seriesx, seriesy = *table.to_a(x, y)
+      seriesx = table[x]
+      seriesy = table[y]
       xrange = (seriesx.min)..(seriesx.max)
       yrange = (seriesy.min)..(seriesy.max)
-      error_bar = error_bar do
+      error_bar do
         series seriesx, seriesy
         range x: xrange, y: yrange
         xlabel x
@@ -96,10 +104,10 @@ module Charty
     end
 
     def to_hst(x, y, **args, &block)
-      serieses = table.to_a(x, y)
+      serieses = [table[x], table[y]]
       xrange = (serieses.flatten.min - 1)..(serieses.flatten.max + 1)
       yrange = 0..serieses[0].size
-      hist = hist do
+      hist do
         data serieses
         range x: xrange, y: yrange
         xlabel x
@@ -109,46 +117,46 @@ module Charty
 
     def bar(**args, &block)
       context = RenderContext.new :bar, **args, &block
-      context.apply(@plotter_adapter)
+      context.apply(@backend)
     end
 
     def barh(**args, &block)
       context = RenderContext.new :barh, **args, &block
-      context.apply(@plotter_adapter)
+      context.apply(@backend)
     end
 
     def box_plot(**args, &block)
       context = RenderContext.new :box_plot, **args, &block
-      context.apply(@plotter_adapter)
+      context.apply(@backend)
     end
 
     def bubble(**args, &block)
       context = RenderContext.new :bubble, **args, &block
-      context.apply(@plotter_adapter)
+      context.apply(@backend)
     end
 
     def curve(**args, &block)
       context = RenderContext.new :curve, **args, &block
-      context.apply(@plotter_adapter)
+      context.apply(@backend)
     end
 
     def scatter(**args, &block)
       context = RenderContext.new :scatter, **args, &block
-      context.apply(@plotter_adapter)
+      context.apply(@backend)
     end
 
     def error_bar(**args, &block)
       context = RenderContext.new :error_bar, **args, &block
-      context.apply(@plotter_adapter)
+      context.apply(@backend)
     end
 
     def hist(**args, &block)
       context = RenderContext.new :hist, **args, &block
-      context.apply(@plotter_adapter)
+      context.apply(@backend)
     end
 
     def layout(definition=:horizontal)
-      Layout.new(@plotter_adapter, definition)
+      Layout.new(@backend, definition)
     end
   end
 
@@ -160,7 +168,7 @@ module Charty
     def initialize(method, **args, &block)
       @method = method
       configurator = Configurator.new(**args)
-      configurator.instance_eval &block
+      configurator.instance_eval(&block)
       # TODO: label も外から付けられた方がよさそう
       (@range, @series, @function, @data, @title, @xlabel, @ylabel, @labels) = configurator.to_a
     end
@@ -229,17 +237,17 @@ module Charty
     end
 
     def render(filename=nil)
-      @plotter_adapter.render(self, filename)
+      @backend.render(self, filename)
     end
 
     def save(filename=nil)
-      @plotter_adapter.save(self, filename)
+      @backend.save(self, filename)
     end
 
-    def apply(plotter_adapter)
+    def apply(backend)
       case
         when !@series.empty?
-          plotter_adapter.series = @series
+          backend.series = @series
         when @function
           linspace = Linspace.new(@range[:x], 100)
           # TODO: set label with function
@@ -247,7 +255,7 @@ module Charty
           @series << Series.new(linspace.to_a, linspace.map{|x| @function.call(x) }, label: "function" )
       end
 
-      @plotter_adapter = plotter_adapter
+      @backend = backend
       self
     end
   end

data/lib/charty/table.rb

@@ -1,11 +1,52 @@
+require 'forwardable'
 
 module Charty
+  class ColumnAccessor
+    def initialize(adapter)
+      @adapter = adapter
+    end
+
+    def [](column_name)
+      @adapter[nil, column_name]
+    end
+  end
+
   class Table
-    def initialize(table)
-      @table = table
+    extend Forwardable
+
+    def initialize(data, **kwargs)
+      adapter_class = TableAdapters.find_adapter_class(data)
+      if kwargs.empty?
+        @adapter = adapter_class.new(data)
+      else
+        @adapter = adapter_class.new(data, **kwargs)
+      end
     end
 
-    attr_reader :table
+    attr_reader :adapter
+
+    def_delegator :@adapter, :column_names
+
+    def columns
+      @column_accessor ||= ColumnAccessor.new(@adapter)
+    end
+
+    def [](*args)
+      n_args = args.length
+      case n_args
+      when 1
+        row = nil
+        column = args[0]
+        @adapter[row, column]
+      when 2
+        row = args[0]
+        column = args[1]
+        @adapter[row, column]
+      else
+        message = "wrong number of arguments (given #{n_args}, expected 1..2)"
+        raise ArgumentError, message
+      end
+    end
 
     def to_a(x=nil, y=nil, z=nil)
       case

data/lib/charty/table_adapters.rb

@@ -0,0 +1,23 @@
+module Charty
+  module TableAdapters
+    @adapters = {}
+
+    def self.register(name, adapter_class)
+      @adapters[name] = adapter_class
+    end
+
+    def self.find_adapter_class(data)
+      @adapters.each_value do |adapter_class|
+        return adapter_class if adapter_class.supported?(data)
+      end
+      raise ArgumentError, "Unsupported data class: #{data.class}"
+    end
+  end
+end
+
+require_relative 'table_adapters/hash_adapter'
+require_relative 'table_adapters/narray_adapter'
+require_relative 'table_adapters/datasets_adapter'
+require_relative 'table_adapters/daru_adapter'
+require_relative 'table_adapters/active_record_adapter'
+require_relative 'table_adapters/nmatrix_adapter'