gnutemplate 0.1.8.2 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dd7398ce7190378ca93785011183b56aa25dea3c87ae8e358156582f238596e
-  data.tar.gz: eb5f9c6ab9d5750cc0c2bd404a0b922858b4af7cdb6b64429b702010d60c0ded
+  metadata.gz: 7fef32d38de9aac460a3999b100fedb69ffa1a95a72589fc196b4dc34385e1bf
+  data.tar.gz: 3ff03c9032f496344d52b28f99e25e6f7440e31b8a617e292871123d0fced7c4
 SHA512:
-  metadata.gz: 27ec96672fd238aa3ef6e60f66f1b13832f29c6690d8ad17caf2cf2a1caacf7cb488be6c4863633242798ef2963750ef9a47432a6d6eb8366ca53f429d3b4b3b
-  data.tar.gz: c50e8c423f6aae5dff91ffdee866b2de055ccd82c57d5f1909ea83259113da98e309992c1471b7993e9d3f2b8416b79390ec5725c76af74108bbde502ccd6902
+  metadata.gz: c6af589bee0cd490502d19f180a5929af1633bd6aae0441856fb8ad7cf3e5de945ecaac27171f31c6e29ba18a668f5784b0036a091a45e6826ca6d2da828fc34
+  data.tar.gz: 466d9643c0fdb0e0697a4afc445da81c1d450dbde07550a62d19ce22e0ac398ac4a3c725454a4a7bd09502f01f980bc963fdcae59c8d404be34d49e055c26a46

data/lib/gnutemplate/version.rb

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

data/lib/gnutemplate.rb

@@ -4,9 +4,32 @@ require_relative "gnutemplate/version"
 require "numo/gnuplot"
 require "histogram/array"
 
+module ExtendNP
+  def new_to_iruby
+      require 'tempfile'
+      tempfile_svg = Tempfile.open(['plot','.svg'])
+      # output SVG to tmpfile
+      gp = Numo::Gnuplot.default
+      gp.reset
+      gp.unset :multiplot    # added 
+      gp.set terminal:'svg'
+      gp.set output:tempfile_svg.path
+      gp.instance_eval(&@block)
+      ### gp.unset 'output'  # commented out
+      svg = File.read(tempfile_svg.path)
+      tempfile_svg.close
+      ["image/svg+xml",svg]
+    end
+end
+
+class Numo::Gnuplot::NotePlot
+  include ExtendNP
+  alias_method :old_to_iruby, :to_iruby
+  alias_method :to_iruby, :new_to_iruby
+end
+
 module Gnutemplate
   class Error < StandardError; end
-
   
   def note_line(data)
     Numo.noteplot do
@@ -112,11 +135,18 @@ module Gnutemplate
     end
   end
 
-  def note_histogram(data, labels: nil, pileup: true,
+  # いずれかはここからargsを返せるようにする
+  # set terminal部の扱いは考えなければならない(多分、_drow, _noteにif...set...end だけ残せばいい)
+  def histogram(data, labels: nil, pileup: true,
     xmin: nil, xmax: nil, ymin: 0, ymax: nil, bins: 10,
     figsize: 1.0, rotate_xtics: 45,
     fill: true, alpha: 33, background: nil,
-    file: nil, engine: :note)
+    file: nil)
+
+    if !file.nil?
+      set terminal: "gif"
+      set output: file
+    end
 
     data = [data] if data[0].kind_of?(Numeric) || data[0].nil?
 
@@ -128,8 +158,86 @@ module Gnutemplate
     freqs = data.map {|d| d.to_a.compact.histogram(bins, min: xmin, max: xmax) }
     ymax ||= freqs.map{ _1[1] }.flatten.max * 1.1
 
+    if pileup
+      ###########
+      ### 
+      ###########
+
+      set size: "#{figsize},#{figsize}"  
+      set style: "fill solid" if fill
+
+      xticinterval = (xmax-xmin).to_f / bins
+      set xtics: "#{xmin-xticinterval}, #{xticinterval}, #{xmax+xticinterval}"
+      set(:xtics, "rotate by #{rotate_xtics}") if rotate_xtics
+
+      set xrange: (xmin-xticinterval)..(xmax+xticinterval)
+      set yrange: ymin..ymax
+
+      args = background ? ["[#{xmin}:#{xmax}] #{ymax} with filledc above y=#{ymin} fc \"##{background}\" notitle", {}] : []
+
+      freqs.each_with_index do |f, i|
+        args.push f[0], f[1]
+
+        if labels
+          args.push({:with => :boxes, :title => labels[i], :fillcolor => "rgb \"#{colors[i % 4]}\""})
+        else
+          args.push({:with => :boxes, :fillcolor => "rgb \"#{colors[i % 4]}\""})
+        end
+      end
+
+      plot *args 
+
+    else
+
+      ###########
+      ### 
+      ###########
+      # set title:"Temperature"
+      set auto:"x"
+      set :style, :data, :histogram
+      set :style, :histogram, :cluster, gap:1
+      set :style, :fill, solid: 1.0 - (alpha/100.0),  border:-1
+      set boxwidth:0.9
+      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}," }
+      .gsub(/,$/, ")")
+      set xtics: xtics
+
+      labels ||= (0...(freqs.length)).map(&:to_s)
+
+      args = freqs.zip(labels).each_with_index.map do |(f, l), i|
+        [*f, using: 2, w: :histogram, t: labels[i], fillcolor: "rgb \"#{colors[i % 4]}\""]
+      end
+
+      plot *args
+
+    end # Of if pileup..else
+  end
+
+  def note_histogram(data, labels: nil, pileup: true,
+    xmin: nil, xmax: nil, ymin: 0, ymax: nil, bins: 10,
+    figsize: 1.0, rotate_xtics: 45,
+    fill: true, alpha: 33, background: nil,
+    file: nil)
+
     Numo.noteplot do
 
+      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.map(&:to_a).flatten.compact.max
+      xmin ||= data.map(&:to_a).flatten.compact.min
+      freqs = data.map {|d| d.to_a.compact.histogram(bins, min: xmin, max: xmax) }
+      ymax ||= freqs.map{ _1[1] }.flatten.max * 1.1
+
       if !file.nil?
         set terminal: "gif"
         set output: file
@@ -193,9 +301,6 @@ module Gnutemplate
         end
 
         plot *args
-        #plot [*freqs[0], using: 2, w: :histogram, t: labels[0], fillcolor: "rgb \"#{colors[0 % 4]}\""],
-        #[*freqs[1], using: 2, w: :histogram, t: labels[1], fillcolor: "rgb \"#{colors[1 % 4]}\""],
-        #[*freqs[2], using: 2, w: :histogram, t: labels[2], fillcolor: "rgb \"#{colors[2 % 4]}\""]
 
       end # Of if pileup..else
     end # Of Numo.noteplot do
@@ -206,7 +311,7 @@ module Gnutemplate
     xmin: nil, xmax: nil, ymin: 0, ymax: nil, bins: 10,
     figsize: 1.0, rotate_xtics: 45,
     fill: true, alpha: 33, background: nil,
-    file: nil, engine: :note)
+    file: nil)
 
     data = [data] if data[0].kind_of?(Numeric) || data[0].nil?
 
@@ -282,10 +387,6 @@ module Gnutemplate
         end
 
         plot *args
-,
-        #[*freqs[1], using: 2, w: :histogram, t: labels[1], fillcolor: "rgb \"#{colors[1 % 4]}\""],
-        #[*freqs[2], using: 2, w: :histogram, t: labels[2], fillcolor: "rgb \"#{colors[2 % 4]}\""]
-        #plot [*freqs[0], using: 2, w: :histogram, t: labels[0], fillcolor: "rgb \"#{colors[0 % 4]}\""]
       
       end # Of if pileup..else
     end # Of Numo.noteplot do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnutemplate
 version: !ruby/object:Gem::Version
-  version: 0.1.8.2
+  version: 0.1.9
 platform: ruby
 authors:
 - showata
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-14 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-gnuplot