charty 0.2.3 → 0.2.4

data/lib/charty/index.rb

@@ -0,0 +1,213 @@
+require "forwardable"
+
+module Charty
+  class Index
+    extend Forwardable
+    include Enumerable
+
+    def initialize(values, name: nil)
+      @values = values
+      @name = name
+    end
+
+    attr_reader :values
+    attr_accessor :name
+
+    def_delegators :values, :length, :size, :each, :to_a
+
+    def ==(other)
+      case other
+      when DaruIndex, PandasIndex
+        return false if length != other.length
+        to_a == other.to_a
+      when Index
+        return false if length != other.length
+        return true if values == other.values
+        to_a == other.to_a
+      else
+        super
+      end
+    end
+
+    def [](i)
+      case i
+      when 0 ... length
+        values[i]
+      else
+        raise IndexError, "index out of range"
+      end
+    end
+
+    def loc(key)
+      values.index(key)
+    end
+
+    def union(other)
+      case other
+      when PandasIndex
+        index = PandasIndex.try_convert(self)
+        return index.union(other) if index
+      end
+
+      Index.new(to_a.union(other.to_a))
+    end
+  end
+
+  class RangeIndex < Index
+    def initialize(values, name: nil)
+      if values.is_a?(Range) && values.begin.is_a?(Integer) && values.end.is_a?(Integer)
+        super
+      else
+        raise ArgumentError, "values must be an integer range"
+      end
+    end
+
+    def length
+      size
+    end
+
+    def [](i)
+      case i
+      when 0 ... length
+        values.begin + i
+      else
+        raise IndexError, "index out of range (#{i} for 0 ... #{length})"
+      end
+    end
+
+    def loc(key)
+      case key
+      when Integer
+        if values.cover?(key)
+          return key - values.begin
+        end
+      end
+    end
+
+    def union(other)
+      case other
+      when RangeIndex
+        return union(other.values)
+      when Range
+        if disjoint_range?(values, other)
+          return Index.new(values.to_a.union(other.to_a))
+        end
+        new_beg = [values.begin, other.begin].min
+        new_end = [values.end,   other.end  ].max
+        new_range = if values.end < new_end
+                      if other.exclude_end?
+                        new_beg ... new_end
+                      else
+                        new_beg .. new_end
+                      end
+                    elsif other.end < new_end
+                      if values.exclude_end?
+                        new_beg ... new_end
+                      else
+                        new_beg .. new_end
+                      end
+                    else
+                      if values.exclude_end? && other.exclude_end?
+                        new_beg ... new_end
+                      else
+                        new_beg .. new_end
+                      end
+                    end
+        RangeIndex.new(new_range)
+      else
+        super
+      end
+    end
+
+    private def disjoint_range?(r1, r2)
+      r1.end < r2.begin || r2.end < r1.begin
+    end
+  end
+
+  class DaruIndex < Index
+    def_delegators :values, :name, :name=
+
+    def length
+      size
+    end
+
+    def ==(other)
+      case other
+      when DaruIndex
+        values == other.values
+      else
+        super
+      end
+    end
+  end
+
+  class PandasIndex < Index
+    def self.try_convert(obj)
+      case obj
+      when PandasIndex
+        obj
+      when ->(x) { defined?(Pandas) && x.is_a?(Pandas::Index) }
+        PandasIndex.new(obj)
+      when RangeIndex, Range
+        obj = obj.values if obj.is_a?(RangeIndex)
+        stop = if obj.exclude_end?
+                 obj.end
+               else
+                 obj.end + 1
+               end
+        PandasIndex.new(Pandas.RangeIndex.new(obj.begin, stop))
+      when ->(x) { defined?(Enumerator::ArithmeticSequence) && x.is_a?(Enumerator::ArithmeticSequence) }
+        stop = if obj.exclude_end?
+                 obj.end
+               else
+                 obj.end + 1
+               end
+        PandasIndex.new(Pandas::RangeIndex.new(obj.begin, stop, obj.step))
+      when Index, Array, DaruIndex, ->(x) { defined?(Daru) && x.is_a?(Daru::Index) }
+        obj = obj.values if obj.is_a?(Index)
+        PandasIndex.new(Pandas::Index.new(obj.to_a))
+      else
+        nil
+      end
+    end
+
+    def_delegators :values, :name, :name=
+
+    def length
+      size
+    end
+
+    def ==(other)
+      case other
+      when PandasIndex
+        Numpy.all(values == other.values)
+      when Index
+        return false if length != other.length
+        Numpy.all(values == other.values.to_a)
+      else
+        super
+      end
+    end
+
+    def each(&block)
+      return enum_for(__method__) unless block_given?
+
+      i, n = 0, length
+      while i < n
+        yield self[i]
+        i += 1
+      end
+    end
+
+    def union(other)
+      other = PandasIndex.try_convert(other)
+      # NOTE: Using `sort=False` in pandas.Index#union does not produce pandas.RangeIndex.
+      # TODO: Reconsider to use `sort=True` here.
+      PandasIndex.new(values.union(other.values, sort: false))
+    end
+
+    private def arithmetic_sequence?(x)
+      defined?(Enumerator::ArithmeticSequence) && x.is_a?(Enumerator::ArithmeticSequence)
+    end
+  end
+end

data/lib/charty/linspace.rb

@@ -8,7 +8,7 @@ module Charty
     end
 
     def each(&block)
-      step = (@range.end - @range.begin).to_f / @num_step
+      step = (@range.end - @range.begin).to_r / (@num_step - 1)
       (@num_step - 1).times do |i|
         block.call(@range.begin + i * step)
       end

data/lib/charty/missing_value_support.rb

@@ -0,0 +1,14 @@
+module Charty
+  module MissingValueSupport
+    def missing_value?(val)
+      case
+      when val.nil?
+        true
+      when val.respond_to?(:nan?) && val.nan?
+        true
+      else
+        false
+      end
+    end
+  end
+end

data/lib/charty/plot_methods.rb

@@ -2,16 +2,181 @@ 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)
+    # @param x  x-dimension input for plotting long-form data.
+    # @param y  y-dimension input for plotting long-form data.
+    # @param color  color-dimension input for plotting long-form data.
+    # @param data  Dataset for plotting.
+    # @param order  Order of the categorical dimension to plot the categorical levels in.
+    # @param color_order  Order of the color dimension to plot the categorical levels in.
+    # @param estimator  Statistical function to estimate withint each categorical bin.
+    # @param ci  Size of confidence intervals to draw around estimated values.
+    # @param n_boot  The size of bootstrap sample to use when computing confidence intervals.
+    # @param units  Identifier of sampling unit.
+    # @param random  Random seed or random number generator for reproducible bootstrapping.
+    # @param orient  Orientation of the plot (:v for vertical, or :h for
+    #        horizontal).
+    # @param key_color  Color for all of the elements, or seed for a gradient palette.
+    # @param palette  Colors to use for the different levels of the color-dimension variable.
+    # @param saturation  Propotion of the original saturation to draw colors.
+    # @param error_color  Color for the lines that represent the confidence intervals.
+    # @param error_width  Thickness of error bar lines (and caps).
+    # @param cap_size  Width of the caps on error bars.
+    # @param dodge  [true,false]  If true, bar position is shifted along the
+    #        categorical axis for avoid overlapping when the color-dimension is used.
+    def bar_plot(x: nil, y: nil, color: nil, data: nil,
+                 order: nil, color_order: nil,
+                 estimator: :mean, ci: 95, n_boot: 1000, units: nil, random: nil,
+                 orient: nil, key_color: nil, palette: nil, saturation: 1r,
+                 error_color: [0.26, 0.26, 0.26], error_width: nil, cap_size: nil,
+                 dodge: true, **options, &block)
+      Plotters::BarPlotter.new(
+        data: data, variables: { x: x, y: y, color: color },
+        order: order, orient: orient,
+        estimator: estimator, ci: ci, n_boot: n_boot, units: units, random: random,
+        color_order: color_order, key_color: key_color, palette: palette, saturation: saturation,
+        error_color: error_color, error_width: error_width, cap_size: cap_size,
+        dodge: dodge,
+        **options, &block
+      )
     end
 
-    def box_plot(x=nil, y=nil, color=nil, **options, &block)
-      Plotters::BoxPlotter.new(x, y, color, **options, &block)
+    def count_plot(x: nil, y: nil, color: nil, data: nil,
+                   order: nil, color_order: nil,
+                   orient: nil, key_color: nil, palette: nil, saturation: 1r,
+                   dodge: true, **options, &block)
+      case
+      when x.nil? && !y.nil?
+        x = y
+        orient = :h
+      when y.nil? && !x.nil?
+        y = x
+        orient = :v
+      when !x.nil? && !y.nil?
+        raise ArgumentError,
+              "Unable to pass both x and y to count_plot"
+      end
+
+      Plotters::CountPlotter.new(
+        data: data,
+        variables: { x: x, y: y, color: color },
+        order: order,
+        orient: orient,
+        estimator: :count,
+        ci: nil,
+        units: nil,
+        random: nil,
+        color_order: color_order,
+        key_color: key_color,
+        palette: palette,
+        saturation: saturation,
+        dodge: dodge,
+        **options
+      ) do |plotter|
+        plotter.value_label = "count"
+        block.(plotter) unless block.nil?
+      end
+    end
+
+    # Show the distributions of the given data by boxes and whiskers.
+    #
+    # @param x  X-dimension input for plotting long-Form data.
+    # @param y  Y-dimension input for plotting long-form data.
+    # @param color  Color-dimension input for plotting long-form data.
+    # @param data  Dataset for plotting.
+    # @param order  Order of the categorical dimension to plot the categorical
+    #        levels in.
+    # @param color_order  Order of the color dimension to plot the categorical
+    #        levels in.
+    # @param orient  Orientation of the plot (:v for vertical, or :h for
+    #        horizontal).
+    # @param key_color  Color for all of the elements, or seed for a gradient
+    #        palette.
+    # @param palette  Colors to use for the different levels of the
+    #        color-dimension variable.
+    # @param saturation  Propotion of the original saturation to draw colors.
+    # @param width  Width of a full element when not using the color-dimension,
+    #        or width of all the elements for one level of the major grouping
+    #        variable.
+    # @param dodge  [true,false]  If true, bar position is shifted along the
+    #        categorical axis for avoid overlapping when the color-dimension
+    #        is used.
+    # @param flier_size  Size of the markers used to indicate outlier
+    #        observations.
+    # @param line_width  Width of the gray lines that frame the plot elements.
+    # @param whisker  Propotion of the IQR past the low and high quartiles to
+    #        extend the plot whiskers.  Points outside of this range will be
+    #        treated as outliers.
+    def box_plot(x: nil, y: nil, color: nil, data: nil,
+                 order: nil, color_order: nil,
+                 orient: nil, key_color: nil, palette: nil, saturation: 1r,
+                 width: 0.8r, dodge: true, flier_size: 5, line_width: nil,
+                 whisker: 1.5, **options, &block)
+      Plotters::BoxPlotter.new(
+        data: data,
+        variables: { x: x, y: y, color: color },
+        order: order,
+        color_order: color_order,
+        orient: orient,
+        key_color: key_color,
+        palette: palette,
+        saturation: saturation,
+        width: width,
+        dodge: dodge,
+        flier_size: flier_size,
+        line_width: line_width,
+        whisker: whisker,
+        **options,
+        &block
+      )
+    end
+
+    # Scatter plot
+    #
+    # @param x [vector-like object, key in data]
+    # @param y [vector-like object, key in data]
+    # @param color [vector-like object, key in data]
+    # @param style [vector-like object, key in data]
+    # @param size [vector-like object, key in data]
+    # @param data [table-like object]
+    # @param key_color [color object]
+    # @param palette [String,Array<Numeric>,Palette]
+    # @param color_order [Array<String>,Array<Symbol>]
+    # @param color_norm
+    # @param sizes [Array, Hash]
+    # @param size_order [Array]
+    # @param size_norm
+    # @param markers [true, false, Array, Hash]
+    # @param marker_order [Array]
+    # @param alpha [scalar number]
+    #        Propotional opacity of the points.
+    # @param legend [:auto, :brief, :full, false]
+    #        How to draw legend.  If :brief, numeric color and size variables
+    #        will be represented with a sample of evenly spaced values.  If
+    #        :full, every group will get an entry in the legend.  If :auto,
+    #        choose between brief or full representation based on number of
+    #        levels.  If false, no legend data is added and no legend is drawn.
+    def scatter_plot(x: nil, y: nil, color: nil, style: nil, size: nil,
+                     data: nil, key_color: nil, palette: nil, color_order: nil,
+                     color_norm: nil, sizes: nil, size_order: nil, size_norm: nil,
+                     markers: true, marker_order: nil, alpha: nil, legend: :auto,
+                     **options, &block)
+      Plotters::ScatterPlotter.new(
+        data: data,
+        variables: { x: x, y: y, color: color, style: style, size: size },
+        key_color: key_color,
+        palette: palette,
+        color_order: color_order,
+        color_norm: color_norm,
+        sizes: sizes,
+        size_order: size_order,
+        size_norm: size_norm,
+        markers: markers,
+        marker_order: marker_order,
+        alpha: alpha,
+        legend: legend,
+        **options,
+        &block
+      )
     end
   end
 

data/lib/charty/plotters.rb

@@ -1,4 +1,11 @@
 require_relative "plotters/abstract_plotter"
+require_relative "plotters/random_support"
+require_relative "plotters/estimation_support"
 require_relative "plotters/categorical_plotter"
 require_relative "plotters/bar_plotter"
 require_relative "plotters/box_plotter"
+require_relative "plotters/count_plotter"
+
+require_relative "plotters/vector_plotter"
+require_relative "plotters/relational_plotter"
+require_relative "plotters/scatter_plotter"

data/lib/charty/plotters/abstract_plotter.rb

@@ -11,7 +11,17 @@ module Charty
         yield self if block_given?
       end
 
-      attr_reader :x, :y, :color, :data, :palette
+      attr_reader :data, :x, :y, :color
+      attr_reader :color_order, :key_color, :palette
+
+      def data=(data)
+        @data = case data
+                when nil, Charty::Table
+                  data
+                else
+                  Charty::Table.new(data)
+                end
+      end
 
       def x=(x)
         @x = check_dimension(x, :x)
@@ -22,20 +32,24 @@ module Charty
       end
 
       def color=(color)
-        # @color = check_dimension(color, :color)
-        unless color.nil?
+        @color = check_dimension(color, :color)
+      end
+
+      def color_order=(color_order)
+        #@color_order = XXX
+        unless color_order.nil?
           raise NotImplementedError,
-                "Specifying color variable is not supported yet"
+                "Specifying color_order is not supported yet"
         end
       end
 
-      def data=(data)
-        @data = case data
-                when nil, Charty::Table
-                  data
-                else
-                  Charty::Table.new(data)
-                end
+      # TODO: move to categorical_plotter
+      def key_color=(key_color)
+        #@key_color = XXX
+        unless key_color.nil?
+          raise NotImplementedError,
+                "Specifying key_color is not supported yet"
+        end
       end
 
       def palette=(palette)
@@ -57,10 +71,12 @@ module Charty
 
       private def check_dimension(value, name)
         case value
-        when nil, Symbol, String, method(:array?)
+        when nil, Symbol, String
           value
         when ->(x) { x.respond_to?(:to_str) }
           value.to_str
+        when method(:array?)
+          Charty::Vector.new(value)
         else
           raise ArgumentError,
                 "invalid type of dimension for #{name} (given #{value.inspect})",
@@ -68,10 +84,69 @@ module Charty
         end
       end
 
+      private def check_number(value, name, allow_nil: false)
+        case value
+        when Numeric
+          value
+        else
+          if allow_nil && value.nil?
+            nil
+          else
+            expected = if allow_nil
+                         "number or nil"
+                       else
+                         "number"
+                       end
+            raise ArgumentError,
+                  "invalid value for #{name} (%p for #{expected})" % value,
+                  caller
+          end
+        end
+      end
+
+      private def check_boolean(value, name, allow_nil: false)
+        case value
+        when true, false
+          value
+        else
+          expected = if allow_nil
+                       "true, false, or nil"
+                     else
+                       "true or false"
+                     end
+          raise ArgumentError,
+                "invalid value for #{name} (%p for #{expected})" % value,
+                caller
+        end
+      end
+
+      private def variable_type(vector, boolean_type=:numeric)
+        if vector.numeric?
+          :numeric
+        elsif vector.categorical?
+          :categorical
+        else
+          case vector[0]
+          when true, false
+            boolean_type
+          else
+            :categorical
+          end
+        end
+      end
+
       private def array?(value)
         TableAdapters::HashAdapter.array?(value)
       end
 
+      private def remove_na!(ary)
+        ary.reject! do |x|
+          next true if x.nil?
+          x.respond_to?(:nan?) && x.nan?
+        end
+        ary
+      end
+
       def to_iruby
         result = render
         ["text/html", result] if result