charty 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c245a8324486b73226c85162c602997c5b8e4f41c6fc03d731cd7c8c0e0c763
-  data.tar.gz: 720f08fdcf14ac5da11eace6f684d002c694de1d1b062fa9b954da4a286ae810
+  metadata.gz: 37ead1e86203bd6580125f4ed97039c6b512e9ae3037a0bc386743ee436f184c
+  data.tar.gz: a94e66292a866acde67c0cfc51bd8eebd5840af68e2d4112caafce80bdd37ed2
 SHA512:
-  metadata.gz: 253bf7b26d3ee72fe604afb4cdf50de412aa956171dc6671c33a158e2252597f71005fbbccb0f879f11688327339bf569f653f15eef6ac30faa4c0173765d607
-  data.tar.gz: b3cbfbd190a145c41db3d3fec8050f9ec4b9ddc12d978fb2c96a3a825409b708c8c0d6f14456ed0bf17f2c8150999ec063a1898d97b37c3e984a88645adc0d4b
+  metadata.gz: b518be17e0ae85405285fe22022bc698d0c080e08a0682f055ae70c97655ed313038e6e2899b7c961bd73c0afe1b6b0c25bdb2085bd3a66dddd57d3e6245df55
+  data.tar.gz: 0bc460c78d178b098c65ab8737efddac0a8484abd920282d185533b72396f0abad62ea247be9e8af4286a70b7a4dc2069e88ff1675ba446af65b5c67edfb59d8

data/charty.gemspec

@@ -42,4 +42,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "activerecord"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "iruby", ">= 0.7.0"
+  spec.add_development_dependency "csv"
 end

data/lib/charty/backends/plotly.rb

@@ -569,30 +569,35 @@ module Charty
         probability: "probability".freeze
       }.freeze
 
-      def univariate_histogram(data, name, variable_name, stat,
-                               bin_start, bin_end, bin_size, alpha,
-                               color, color_mapper)
-        orientation = case variable_name
-                      when :x
-                        :v
-                      else
-                        :h
-                      end
+      def univariate_histogram(hist, name, variable_name, stat,
+                               alpha, color, key_color, color_mapper,
+                               _multiple, _element, _fill, _shrink)
+        value_axis = variable_name
+        case value_axis
+        when :x
+          weights_axis = :y
+          orientation = :v
+        else
+          weights_axis = :x
+          orientation = :h
+        end
+
+        mid_points = hist.edges.each_cons(2).map {|a, b| a + (b - a) / 2 }
+
         trace = {
-          type: "histogram",
+          type: :bar,
           name: name.to_s,
-          variable_name => data.to_a,
+          value_axis => mid_points,
+          weights_axis => hist.weights,
           orientation: orientation,
-          histnorm: PLOTLY_HISTNORM[stat],
-          "#{variable_name}bins": {
-            start: bin_start,
-            end: bin_end,
-            size: bin_size
-          },
           opacity: alpha
         }
 
-        if color
+        if color.nil?
+          trace[:marker] = {
+            color: key_color.to_rgb.to_hex_string
+          }
+        else
           trace[:marker] = {
             color: color_mapper[color].to_rgb.to_hex_string
           }

data/lib/charty/backends/pyplot.rb

@@ -14,6 +14,7 @@ module Charty
 
       def initialize
         @pyplot = ::Matplotlib::Pyplot
+        @default_edgecolor = Colors["white"].to_rgb
         @default_line_width = ::Matplotlib.rcParams["lines.linewidth"]
         @default_marker_size = ::Matplotlib.rcParams["lines.markersize"]
       end
@@ -575,6 +576,47 @@ module Charty
         min + x * (max - min)
       end
 
+      def univariate_histogram(hist, name, variable_name, stat,
+                               alpha, color, key_color, color_mapper,
+                               multiple, element, fill, shrink)
+        mid_points = hist.edges.each_cons(2).map {|a, b| a + (b - a) / 2 }
+        orient = variable_name == :x ? :v : :h
+        width = shrink * (hist.edges[1] - hist.edges[0])
+
+        kw = {align: :edge}
+
+        color = if color.nil?
+                  key_color.to_rgb
+                else
+                  color_mapper[color].to_rgb
+                end
+
+        alpha = 1r unless fill
+
+        if fill
+          kw[:facecolor] = color.to_rgba(alpha: alpha).to_hex_string
+          if multiple == :stack || multiple == :fill || element == :bars
+            kw[:edgecolor] = @default_edgecolor.to_hex_string
+          else
+            kw[:edgecolor] = color.to_hex_string
+          end
+        elsif element == :bars
+          kw.delete(:facecolor)
+          kw[:edgecolor] = color.to_rgba(alpha: alpha).to_hex_string
+        else
+          kw[:color] = color.to_rgba(alpha: alpha).to_hex_string
+        end
+
+        kw[:label] = name unless name.nil?
+
+        ax = @pyplot.gca
+        if orient == :v
+          ax.bar(mid_points, hist.weights, width, **kw)
+        else
+          ax.barh(mid_points, hist.weights, width, **kw)
+        end
+      end
+
       private def locator_to_legend_entries(locator, limits)
         vmin, vmax = limits
         dtype = case vmin
@@ -686,6 +728,7 @@ module Charty
           params[key] = kwargs[key] if kwargs.key?(key)
         end
         @pyplot.savefig(filename, **params)
+        @pyplot.close
       end
 
       def show

data/lib/charty/plot_methods.rb

@@ -249,17 +249,16 @@ module Charty
       )
     end
 
-    def hist_plot(data: nil, x: nil, y: nil, color: nil,
+    def hist_plot(data: nil, x: nil, y: nil, color: nil, weights: nil,
                   stat: :count, bins: :auto,
+                  bin_range: nil, common_bins: true,
                   key_color: nil, palette: nil, color_order: nil, color_norm: nil,
                   legend: true, **options, &block)
       # TODO: support following arguments
       # - wiehgts
       # - binwidth
-      # - binrange
       # - discrete
       # - cumulative
-      # - common_bins
       # - common_norm
       # - multiple
       # - element
@@ -278,8 +277,11 @@ module Charty
       Plotters::HistogramPlotter.new(
         data: data,
         variables: { x: x, y: y, color: color },
+        weights: weights,
         stat: stat,
         bins: bins,
+        bin_range: bin_range,
+        common_bins: common_bins,
         key_color: key_color,
         palette: palette,
         color_order: color_order,

data/lib/charty/plotters/distribution_plotter.rb

@@ -14,6 +14,12 @@ module Charty
         setup_variables
       end
 
+      attr_reader :weights
+
+      def weights=(val)
+        @weights = check_dimension(val, :weights)
+      end
+
       attr_reader :variables
 
       attr_reader :color_norm
@@ -103,6 +109,7 @@ module Charty
           x: self.x,
           y: self.y,
           color: self.color,
+          weights: self.weights
         }.each do |key, val|
           next if val.nil?
 

data/lib/charty/plotters/histogram_plotter.rb

@@ -12,16 +12,6 @@ module Charty
         ([:x, :y] & self.variables.keys)[0]
       end
 
-      attr_reader :weights
-
-      def weights=(val)
-        @weights = check_weights(val)
-      end
-
-      private def check_weights(val)
-        raise NotImplementedError, "weights is not supported yet"
-      end
-
       attr_reader :stat
 
       def stat=(val)
@@ -65,10 +55,44 @@ module Charty
       end
 
       # TODO: bin_width
-      # TODO: bin_range
+
+      attr_reader :bin_range
+
+      def bin_range=(val)
+        @bin_range = check_bin_range(val)
+      end
+
+      private def check_bin_range(val)
+        case val
+        when nil, Range
+          return val
+        when Array
+          if val.length == 2
+            val.each_with_index do |v, i|
+              check_number(v, "bin_range[#{i}]")
+            end
+            return val
+          else
+            amount = val.length < 2 ? "few" : "many"
+            raise ArgumentError,
+                  "Too #{amount} items in `bin_range` array (%p for 2)" % val.length
+          end
+        else
+          raise ArgumentError,
+                "Invalid value for `bin_range` " +
+                "(%p for a range or a pair of numbers)" % val
+        end
+      end
+
       # TODO: discrete
       # TODO: cumulative
-      # TODO: common_bins
+
+      attr_reader :common_bins
+
+      def common_bins=(val)
+        @common_bins = check_boolean(val, :common_bins)
+      end
+
       # TODO: common_norm
 
       attr_reader :multiple
@@ -127,28 +151,52 @@ module Charty
       private def draw_univariate_histogram(backend)
         map_color(palette: palette, order: color_order, norm: color_norm)
 
+        key_color = self.key_color
+        if key_color.nil? && !self.variables.key?(:color)
+          palette = case self.palette
+                    when Palette
+                      self.palette
+                    when nil
+                      Palette.default
+                    else
+                      Palette[self.palette]
+                    end
+          key_color = palette[0]
+        end
+
         # TODO: calculate histogram here and use bar plot to visualize
         data_variable = self.univariate_variable
 
-        histograms = {}
-        each_subset([:color], processed: true) do |sub_vars, sub_data|
-          key = sub_vars.to_a
-          observations = sub_data[data_variable].drop_na.to_a
-          hist = if bins != :auto
-                   Statistics.histogram(observations, bins)
-                 else
-                   Statistics.histogram(observations)
-                 end
-          histograms[key] = hist
-        end
-
-        bin_start, bin_end, bin_size = nil
-        histograms.each do |_, hist|
-          s, e = hist.edge.minmax
-          z = (e - s).to_f / (hist.edge.length - 1)
-          bin_start = [bin_start, s].compact.min
-          bin_end   = [bin_end, e].compact.max
-          bin_size  = [bin_size, z].compact.min
+        if common_bins
+          all_data = processed_data.drop_na
+          all_observations = all_data[data_variable].to_a
+
+          bins = self.bins
+          bins = 10 if self.variables.key?(:color) && bins == :auto
+
+          case bins
+          when Integer
+            case bin_range
+            when Range
+              start = bin_range.begin
+              stop  = bin_range.end
+            when Array
+              start, stop = bin_range.minmax
+            end
+            data_range = all_observations.minmax
+            start ||= data_range[0]
+            stop ||= data_range[1]
+            if start == stop
+              start -= 0.5
+              stop += 0.5
+            end
+            common_bin_edges = Linspace.new(start .. stop, bins + 1).map(&:to_f)
+          else
+            params = {}
+            params[:weights] = all_data[:weights].to_a if all_data.column?(:weights)
+            h = Statistics.histogram(all_observations, bins, **params)
+            common_bin_edges = h.edges
+          end
         end
 
         if self.variables.key?(:color)
@@ -158,12 +206,16 @@ module Charty
         end
 
         each_subset([:color], processed: true) do |sub_vars, sub_data|
-          name = sub_vars[:color]
           observations = sub_data[data_variable].drop_na.to_a
+          params = {}
+          params[:weights] = sub_data[:weights].to_a if sub_data.column?(:weights)
+          params[:edges] = common_bin_edges if common_bin_edges
+          hist = Statistics.histogram(observations, bins, **params)
 
-          backend.univariate_histogram(observations, name, data_variable, stat,
-                                       bin_start, bin_end, bin_size, alpha,
-                                       name, @color_mapper)
+          name = sub_vars[:color]
+          backend.univariate_histogram(hist, name, data_variable, stat,
+                                       alpha, name, key_color, @color_mapper,
+                                       multiple, :bars, true, 1r)
         end
       end
 
@@ -179,6 +231,10 @@ module Charty
           end
           backend.set_ylabel(ylabel) if ylabel
           backend.set_xlabel(xlabel) if xlabel
+
+          if self.variables.key?(:color)
+            backend.legend(loc: :best, title: self.variables[:color])
+          end
         end
       end
     end

data/lib/charty/table_adapters/hash_adapter.rb

@@ -20,6 +20,8 @@ module Charty
           end
         when Hash
           true
+        when ->(x) { defined?(CSV::Table) && x.is_a?(CSV::Table) }
+          true
         end
       end
 
@@ -79,6 +81,9 @@ module Charty
           else
             unsupported_data_format
           end
+        when ->(x) { defined?(CSV::Table) && x.is_a?(CSV::Table) }
+          columns ||= data.headers
+          arrays = data.headers.map {|x| data[x] }
         else
           unsupported_data_format
         end

data/lib/charty/version.rb

@@ -1,5 +1,5 @@
 module Charty
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 
   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.8
+  version: 0.2.9
 platform: ruby
 authors:
 - youchan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-colors
@@ -208,6 +208,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: csv
+  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