gnutemplate 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1571cfebbbc0fa1eb30f8ebfb450d3a127f42c0a4036a66148aa703ea410e0b0
-  data.tar.gz: a568514c4a150a9abe5ae457a179733bdb5383c9a513b9eb52249a1af70e36dc
+  metadata.gz: 938bfcdda59a01c5b28de1b23a331dc0c460a7463fb1d29e5015529d30c44b38
+  data.tar.gz: 074f1acb7782fe8144a2ccdf080c1585926cbe80ac0168f2a342dc74ce10f22c
 SHA512:
-  metadata.gz: 3be04538a1375a47b6101472ed034617a07cebb103036dfea002d29413fa8ec4d20763a7c3a0e18944dd991fa6884f71d36bb5385d454d33a1f2d397382247f2
-  data.tar.gz: 727928cbe42364cb85840f639164ee4088accbfc0c57a94609aba6471a7cf10b4d239b0cae4e0018650be84e0d323bb27df482c2eaa27f3095a2cd5668ddd66a
+  metadata.gz: 2e1fe6e09cce907cf658a4565ce6e66bbdc49737d777ce2be168ecf8cf24abc1917b66155f6a391076ed1071ef9c1f008d280648e0130b0cc6fe538e154fafeb
+  data.tar.gz: c634c9fb872802587644288d539601380522eb28093af6f045b9d1b43fffc4fd7a62c7eca587ee9635a705b30bbb84677e3ba34f5c5c0c79a5248d79e82d587d

data/lib/gnutemplate/version.rb

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

data/lib/gnutemplate.rb

@@ -53,7 +53,7 @@ module Gnutemplate
         set :xtics, "rotate by 90"
       end
 
-      xrange ||= (rows_min.flatten.compact.min)..(rows_max.flatten.compact.max)
+      xrange ||= (rows_min.to_a.flatten.compact.min)..(rows_max.to_a.flatten.compact.max)
       set xrange: xrange
       set :grid
       set style: :fill_solid
@@ -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
@@ -93,7 +93,7 @@ module Gnutemplate
         set :xtics, "rotate by 90"
       end
 
-      xrange ||= (rows_min.flatten.compact.min)..(rows_max.flatten.compact.max)
+      xrange ||= (rows_min.to_a.flatten.compact.min)..(rows_max.to_a.flatten.compact.max)
       set xrange: xrange
       set :grid
       set style: :fill_solid
@@ -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) }
+    xmax ||= data.to_a.flatten.max
+    xmin ||= data.to_a.flatten.min
+    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,12 +175,11 @@ 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
 
-
         xtics = freqs[0][0]
         .each.with_index
         .inject("(") { |result, (x, i)| result += "'#{x-xticinterval/2}-#{x+xticinterval/2}' #{i}," }
@@ -195,16 +196,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) }
+    xmax ||= data.to_a.flatten.max
+    xmin ||= data.to_a.flatten.min
+    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 +256,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnutemplate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - showata
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-08 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-gnuplot