charty 0.2.3 → 0.2.4

data/charty.gemspec

@@ -28,14 +28,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "red-colors"
   spec.add_dependency "red-palette", ">= 0.2.0"
+
   spec.add_development_dependency "bundler", ">= 1.16"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"
-  spec.add_development_dependency "numo-narray"
-  spec.add_development_dependency "nmatrix"
   spec.add_development_dependency "red-datasets", ">= 0.0.9"
   spec.add_development_dependency "daru"
   spec.add_development_dependency "activerecord"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "matplotlib"
 end

data/lib/charty.rb

@@ -6,10 +6,14 @@ require "palette"
 require_relative "charty/backends"
 require_relative "charty/backend_methods"
 require_relative "charty/plotter"
+require_relative "charty/index"
 require_relative "charty/layout"
 require_relative "charty/linspace"
+require_relative "charty/missing_value_support"
 require_relative "charty/plotters"
 require_relative "charty/plot_methods"
 require_relative "charty/table_adapters"
 require_relative "charty/table"
 require_relative "charty/statistics"
+require_relative "charty/vector_adapters"
+require_relative "charty/vector"

data/lib/charty/backends/gruff.rb

@@ -83,7 +83,7 @@ module Charty
           p.x_axis_label = context.xlabel if context.xlabel
           p.y_axis_label = context.ylabel if context.ylabel
           context.series.each do |data|
-            p.data(data.label, data.xs.to_a)
+            p.dataxy(data.label, data.xs.to_a, data.ys.to_a)
           end
           p
         when :scatter
@@ -99,7 +99,18 @@ module Charty
           # refs. https://github.com/topfunky/gruff/issues/163
           raise NotImplementedError
         when :hist
-          raise NotImplementedError
+          p = plot::Histogram.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
+          if context.range_x
+            p.minimum_bin = context.range_x.first
+            p.maximum_bin = context.range_x.last
+          end
+          context.data.each do |data|
+            p.data('', data.to_a)
+          end
+          p
         end
       end
     end

data/lib/charty/backends/plotly.rb

@@ -1,4 +1,5 @@
-require 'json'
+require "json"
+require "securerandom"
 
 module Charty
   module Backends
@@ -117,32 +118,254 @@ module Charty
 
       def begin_figure
         @traces = []
-        @layout = {}
+        @layout = {showlegend: false}
       end
 
-      def bar(bar_pos, values, color: nil, width: 0.8r, align: :center, orient: :v)
-        color = Array(color).map(&:to_hex_string)
-        @traces << {
+      def bar(bar_pos, group_names, values, colors, orient, label: nil, width: 0.8r,
+              align: :center, conf_int: nil, error_colors: nil, error_width: nil, cap_size: nil)
+        bar_pos = Array(bar_pos)
+        values = Array(values)
+        colors = Array(colors).map(&:to_hex_string)
+
+        if orient == :v
+          x, y = bar_pos, values
+          x = group_names unless group_names.nil?
+        else
+          x, y = values, bar_pos
+          y = group_names unless group_names.nil?
+        end
+
+        trace = {
           type: :bar,
-          x: bar_pos,
-          y: values,
-          marker: {color: color}
+          orientation: orient,
+          x: x,
+          y: y,
+          width: width,
+          marker: {color: colors}
         }
-        @layout[:showlegend] = false
+        trace[:name] = label unless label.nil?
+
+        unless conf_int.nil?
+          errors_low = conf_int.map.with_index {|(low, _), i| values[i] - low }
+          errors_high = conf_int.map.with_index {|(_, high), i| high - values[i] }
+
+          error_bar = {
+            type: :data,
+            visible: true,
+            symmetric: false,
+            array: errors_high,
+            arrayminus: errors_low,
+            color: error_colors[0].to_hex_string
+          }
+          error_bar[:thickness] = error_width unless error_width.nil?
+          error_bar[:width] = cap_size unless cap_size.nil?
+
+          error_bar_key = orient == :v ? :error_y : :error_x
+          trace[error_bar_key] = error_bar
+        end
+
+        @traces << trace
+
+        if group_names
+          @layout[:barmode] = :group
+        end
+      end
+
+      def box_plot(plot_data, group_names,
+                   orient:, colors:, gray:, dodge:, width: 0.8r,
+                   flier_size: 5, whisker: 1.5, notch: false)
+        colors = Array(colors).map(&:to_hex_string)
+        gray = gray.to_hex_string
+        width = Float(width)
+        flier_size = Float(width)
+        whisker = Float(whisker)
+
+        traces = plot_data.map.with_index do |group_data, i|
+          group_data = Array(group_data)
+          trace = {
+            type: :box,
+            orientation: orient,
+            name: group_names[i],
+            marker: {color: colors[i]}
+          }
+          if orient == :v
+            trace.update(y: group_data)
+          else
+            trace.update(x: group_data)
+          end
+
+          trace
+        end
+
+        traces.reverse! if orient == :h
+
+        @traces.concat(traces)
+      end
+
+      def grouped_box_plot(plot_data, group_names, color_names,
+                           orient:, colors:, gray:, dodge:, width: 0.8r,
+                           flier_size: 5, whisker: 1.5, notch: false)
+        colors = Array(colors).map(&:to_hex_string)
+        gray = gray.to_hex_string
+        width = Float(width)
+        flier_size = Float(width)
+        whisker = Float(whisker)
+
+        @layout[:boxmode] = :group
+
+        if orient == :h
+          @layout[:xaxis] ||= {}
+          @layout[:xaxis][:zeroline] = false
+
+          plot_data = plot_data.map {|d| d.reverse }
+          group_names = group_names.reverse
+        end
+
+        traces = color_names.map.with_index do |color_name, i|
+          group_keys = group_names.flat_map.with_index { |name, j|
+            Array.new(plot_data[i][j].length, name)
+          }.flatten
+
+          values = plot_data[i].flat_map {|d| Array(d) }
+
+          trace = {
+            type: :box,
+            orientation: orient,
+            name: color_name,
+            marker: {color: colors[i]}
+          }
+
+          if orient == :v
+            trace.update(y: values, x: group_keys)
+          else
+            trace.update(x: values, y: group_keys)
+          end
+
+          trace
+        end
+
+        @traces.concat(traces)
       end
 
-      def box_plot(plot_data, positions, color:, gray:,
-                   width: 0.8r, flier_size: 5, whisker: 1.5, notch: false)
-        color = Array(color).map(&:to_hex_string)
-        plot_data.each_with_index do |group_data, i|
-          data = if group_data.empty?
-                   {type: :box, y: [] }
-                 else
-                   {type: :box, y: group_data, marker: {color: color[i]}}
-                 end
-          @traces << data
+      def scatter(x, y, variables, legend:, color:, color_mapper:,
+                  style:, style_mapper:, size:, size_mapper:)
+        if legend == :full
+          warn("Plotly backend does not support full verbosity legend")
+        end
+
+        orig_x, orig_y = x, y
+
+        x = case x
+            when Charty::Vector
+              x.to_a
+            else
+              Array.try_convert(x)
+            end
+        if x.nil?
+          raise ArgumentError, "Invalid value for x: %p" % orig_x
+        end
+
+        y = case y
+            when Charty::Vector
+              y.to_a
+            else
+              Array.try_convert(y)
+            end
+        if y.nil?
+          raise ArgumentError, "Invalid value for y: %p" % orig_y
+        end
+
+        unless color.nil? && style.nil?
+          grouped_scatter(x, y, variables, legend: legend,
+                          color: color, color_mapper: color_mapper,
+                          style: style, style_mapper: style_mapper,
+                          size: size, size_mapper: size_mapper)
+          return
         end
-        @layout[:showlegend] = false
+
+        trace = {
+          type: :scatter,
+          mode: :markers,
+          x: x,
+          y: y,
+          marker: {
+            line: {
+              width: 1,
+              color: "#fff"
+            },
+            size: 10
+          }
+        }
+
+        unless size.nil?
+          trace[:marker][:size] = size_mapper[size].map {|x| 6.0 + x * 6.0 }
+        end
+
+        @traces << trace
+      end
+
+      private def grouped_scatter(x, y, variables, legend:, color:, color_mapper:,
+                                  style:, style_mapper:, size:, size_mapper:)
+        @layout[:showlegend] = true
+
+        groups = (0 ... x.length).group_by do |i|
+          key = {}
+          key[:color] = color[i] unless color.nil?
+          key[:style] = style[i] unless style.nil?
+          key
+        end
+
+        groups.each do |group_key, indices|
+          trace = {
+            type: :scatter,
+            mode: :markers,
+            x: x.values_at(*indices),
+            y: y.values_at(*indices),
+            marker: {
+              line: {
+                width: 1,
+                color: "#fff"
+              },
+              size: 10
+            }
+          }
+
+          unless size.nil?
+            vals = size.values_at(*indices)
+            trace[:marker][:size] = size_mapper[vals].map(&method(:scale_scatter_point_size))
+          end
+
+          name = []
+          legend_title = []
+
+          if group_key.key?(:color)
+            trace[:marker][:color] = color_mapper[group_key[:color]].to_hex_string
+            name << group_key[:color]
+            legend_title << variables[:color]
+          end
+
+          if group_key.key?(:style)
+            trace[:marker][:symbol] = style_mapper[group_key[:style], :marker]
+            name << group_key[:style]
+            legend_title << variables[:style]
+          end
+
+          trace[:name] = name.uniq.join(", ") unless name.empty?
+
+          @traces << trace
+
+          unless legend_title.empty?
+            @layout[:legend] ||= {}
+            @layout[:legend][:title] = {text: legend_title.uniq.join(", ")}
+          end
+        end
+      end
+
+      private def scale_scatter_point_size(x)
+        min = 6
+        max = 12
+
+        min + x * (max - min)
       end
 
       def set_xlabel(label)
@@ -161,21 +384,100 @@ module Charty
         @layout[:xaxis][:tickvals] = values
       end
 
+      def set_yticks(values)
+        @layout[:yaxis] ||= {}
+        @layout[:yaxis][:tickmode] = "array"
+        @layout[:yaxis][:tickvals] = values
+      end
+
       def set_xtick_labels(labels)
         @layout[:xaxis] ||= {}
         @layout[:xaxis][:tickmode] = "array"
         @layout[:xaxis][:ticktext] = labels
       end
 
+      def set_ytick_labels(labels)
+        @layout[:yaxis] ||= {}
+        @layout[:yaxis][:tickmode] = "array"
+        @layout[:yaxis][:ticktext] = labels
+      end
+
       def set_xlim(min, max)
         @layout[:xaxis] ||= {}
         @layout[:xaxis][:range] = [min, max]
       end
 
+      def set_ylim(min, max)
+        @layout[:yaxis] ||= {}
+        @layout[:yaxis][:range] = [min, max]
+      end
+
       def disable_xaxis_grid
         # do nothing
       end
 
+      def disable_yaxis_grid
+        # do nothing
+      end
+
+      def invert_yaxis
+        @traces.each do |trace|
+          case trace[:type]
+          when :bar
+            trace[:y].reverse!
+          end
+        end
+
+        if @layout[:boxmode] == :group
+          @traces.reverse!
+        end
+
+        if @layout[:yaxis] && @layout[:yaxis][:ticktext]
+          @layout[:yaxis][:ticktext].reverse!
+        end
+      end
+
+      def legend(loc:, title:)
+        @layout[:showlegend] = true
+        @layout[:legend] = {
+          title: {
+            text: title
+          }
+        }
+        # TODO: Handle loc
+      end
+
+      def save(filename, title: nil)
+        html = <<~HTML
+          <!DOCTYPE html>
+          <html>
+          <head>
+          <meta charset="utf-8">
+          <title>%{title}</title>
+          <script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
+          </head>
+          <body>
+          <div id="%{id}" style="width: 100%%; height:100%%;"></div>
+          <script type="text/javascript">
+          Plotly.newPlot("%{id}", %{data}, %{layout});
+          </script>
+          </body>
+          </html>
+        HTML
+        html %= {
+          title: title || default_html_title,
+          id: SecureRandom.uuid,
+          data: JSON.dump(@traces),
+          layout: JSON.dump(@layout)
+        }
+        File.write(filename, html)
+        nil
+      end
+
+      private def default_html_title
+        "Charty plot"
+      end
+
       def show
         unless defined?(IRuby)
           raise NotImplementedError,