gnutemplate 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8a82a7fe778279fa02fcb58398a374bd7e8a38daf3ce77d37c893620914b9fd
-  data.tar.gz: aced9c23b6c368788faf7a6346913b7dacfff8768d6210feb50da04c152a32a3
+  metadata.gz: 7b32995859d468d838a3c7f476b474c01e63a78b6a83322520e32a8679ba61a4
+  data.tar.gz: 4c9c563343a43a41381139321133c4d54ce0149b025a5902552e2f7a85b86bb9
 SHA512:
-  metadata.gz: 6590cea51d2c4371d362372d1e7ea7a7a4a6980186a3266916d24be8cadd384945d460b7ca464cf20d173667313908e4303e17872090b7ca15a4d82752b6aca4
-  data.tar.gz: 8f1883afe227201d8552674a6c4788a3604edbb68306c73b519649e5e517148fc9fdb4261a3dc93078055ca9bf0ab098a834c83bf0bb9fe52946a242ddbda1ae
+  metadata.gz: 7fe81edb3d97e393a8a6ff75aa40359c40bfb6308caafba292d524f76a6c9c5a4ee81e6ab6712ba233b8cc88337079b51debdbcdb7fab6106219cad573676cf3
+  data.tar.gz: d6a66f2a88b1a0cd9dc738c3bc26f9d2d2c78dba0f3be755f0ed30052af0ba0a7cd95da01800659f3f03ef2e5c19dc68951bb19288ec45a2d28a02852d93dc12

data/lib/gnutemplate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gnutemplate
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/gnutemplate.rb

@@ -65,7 +65,7 @@ module Gnutemplate
       # X軸はこの場合配列にしなきゃだめ(to_a) これは癖をつけたほうが安全
 
       args = rows_min.zip(rows_max, titlenames).each.with_index.inject([]) do |result, ((mi, ma, t), i)|
-        result += [xrange.to_a, mi, mi, ma, ma, {with: "candlesticks", fc_rgb: colors[i % 4], title: t} ]
+        result += [xrange.to_a, mi.to_a, mi.to_a, ma.to_a, ma.to_a, {with: "candlesticks", fc_rgb: colors[i % 4], title: t} ]
       end
 
       plot *args
@@ -105,7 +105,7 @@ module Gnutemplate
       # X軸はこの場合配列にしなきゃだめ(to_a) これは癖をつけたほうが安全
 
       args = rows_min.zip(rows_max, titlenames).each.with_index.inject([]) do |result, ((mi, ma, t), i)|
-        result += [xrange.to_a, mi, mi, ma, ma, {with: "candlesticks", fc_rgb: colors[i % 4], title: t} ]
+        result += [xrange.to_a, mi.to_a, mi.to_a, ma.to_a, ma.to_a, {with: "candlesticks", fc_rgb: colors[i % 4], title: t} ]
       end
 
       plot *args
@@ -114,16 +114,18 @@ module Gnutemplate
 
   def note_histogram(data, labels: nil, pileup: true,
     xmin: nil, xmax: nil, ymin: 0, ymax: nil, bins: 10,
-    figsize: 1.0, rotate_xtics: nil,
+    figsize: 1.0, rotate_xtics: 45,
     fill: true, alpha: 33, background: nil,
     file: nil, engine: :note)
 
+    data = [data] if data[0].kind_of?(Numeric) || data[0].nil?
+
     alpha_hex = (alpha * 256 / 100).to_s(16).upcase
     colors = ["##{alpha_hex}CC0000", "##{alpha_hex}00CC00", "##{alpha_hex}0000CC", "##{alpha_hex}888800"]
 
     xmax ||= data.flatten.max
     xmin ||= data.flatten.min
-    freqs = data.map {|d| d.histogram(bins, min: xmin, max: xmax) }
+    freqs = data.map {|d| d.to_a.histogram(bins, min: xmin, max: xmax) }
     ymax ||= freqs.map{ _1[1] }.flatten.max * 1.1
 
     Numo.noteplot do
@@ -173,7 +175,7 @@ module Gnutemplate
         set :style, :histogram, :cluster, gap:1
         set :style, :fill_solid, border:-1
         set boxwidth:0.9
-        set :xtic, :rotate, by:-45, scale:0
+        set :xtic, :rotate, by: rotate_xtics, scale: 0
 
         xticinterval = (xmax-xmin).to_f / bins
         set xrange: 0..((xmax-xmin) / xticinterval).to_i
@@ -195,16 +197,18 @@ module Gnutemplate
 
   def draw_histogram(data, labels: nil, pileup: true,
     xmin: nil, xmax: nil, ymin: 0, ymax: nil, bins: 10,
-    figsize: 1.0, rotate_xtics: nil,
+    figsize: 1.0, rotate_xtics: 45,
     fill: true, alpha: 33, background: nil,
     file: nil, engine: :note)
 
+    data = [data] if data[0].kind_of?(Numeric) || data[0].nil?
+
     alpha_hex = (alpha * 256 / 100).to_s(16).upcase
     colors = ["##{alpha_hex}CC0000", "##{alpha_hex}00CC00", "##{alpha_hex}0000CC", "##{alpha_hex}888800"]
 
     xmax ||= data.flatten.max
     xmin ||= data.flatten.min
-    freqs = data.map {|d| d.histogram(bins, min: xmin, max: xmax) }
+    freqs = data.map {|d| d.to_a.histogram(bins, min: xmin, max: xmax) }
     ymax ||= freqs.map{ _1[1] }.flatten.max * 1.1
 
     Numo.gnuplot do
@@ -253,7 +257,7 @@ module Gnutemplate
         set :style, :histogram, :cluster, gap:1
         set :style, :fill_solid, border:-1
         set boxwidth:0.9
-        set :xtic, :rotate, by:-45, scale:0
+        set :xtic, :rotate, by: rotate_xtics, scale: 0
 
         xticinterval = (xmax-xmin).to_f / bins
         set xrange: 0..((xmax-xmin) / xticinterval).to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gnutemplate
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - showata
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: histogram-array
+  name: histogram
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="