gnutemplate 0.1.8.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08348dfcbd8aa2c5f4d3204ba6d1cbb7215e69c5c36d3c7ed125f2947cc7b0a5'
-  data.tar.gz: a0b2af796fd95613d344446517178c53c5ba2ca11b4b32b08ff2b836fdde7542
+  metadata.gz: 5faac0acbe5d64d0e9cf6aec58ffed06004f62e0c372ef4a551881de916e2c64
+  data.tar.gz: b2676c4052f26536e59c5e34379e67fb7f7013f3ca40479088342aa0ae71e7c6
 SHA512:
-  metadata.gz: f5753ee46b8a405aa613df70a6f8dd771b84646da13a242cd0e77d5bbcbdbb046cf09d4d718ab561459497008d0e249bb429edca9d82c029a7d1caa81fbbc134
-  data.tar.gz: 5d17439db11bb344a51ac20a32b7bf04fe6930f86e204546d043e043750f4d1a775b573ef48a86df53c01b01bec8e2ca74771245bffe3c1cc96403ff7884c136
+  metadata.gz: 28dd05eeaa1cda84b9fcca9d0eb537af4e884e103e7b2b9e80314350dbe32c97a0504902af8d9e4f3f1555579afee54947bf404955d05b62fa82b47717591bcb
+  data.tar.gz: a7413b695ff3273cd126c1beb0b477b4f81e53a0ad573b89008566401e2408f161bd3f62151cc8ec1037efd798ae074865e52a3e90f9958bf058472480b51114

data/lib/gnutemplate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gnutemplate
-  VERSION = "0.1.8.3"
+  VERSION = "0.2.0"
 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,13 @@ 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)
 
     data = [data] if data[0].kind_of?(Numeric) || data[0].nil?
 
@@ -128,73 +153,160 @@ 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
+
+      return 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
+
+      return 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
 
       if !file.nil?
         set terminal: "gif"
         set output: file
       end
+      
+      args = histogram(data, labels: labels, pileup: pileup,
+      xmin: xmin, xmax: xmax, ymin: ymin, ymax: ymax, bins: bins,
+      figsize: figsize, rotate_xtics: rotate_xtics,
+      fill: fill, alpha: alpha, background: background)
+
+      plot *args
 
-      if pileup
-        ###########
-        ### 
-        ###########
+      # data = [data] if data[0].kind_of?(Numeric) || data[0].nil?
 
-        set size: "#{figsize},#{figsize}"  
-        set style: "fill solid" if fill
+      # 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
 
-        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
+      # if pileup
+      #   ###########
+      #   ### 
+      #   ###########
 
-        args = background ? ["[#{xmin}:#{xmax}] #{ymax} with filledc above y=#{ymin} fc \"##{background}\" notitle", {}] : []
+      #   set size: "#{figsize},#{figsize}"  
+      #   set style: "fill solid" if fill
 
-        freqs.each_with_index do |f, i|
-          args.push f[0], f[1]
+      #   xticinterval = (xmax-xmin).to_f / bins
+      #   set xtics: "#{xmin-xticinterval}, #{xticinterval}, #{xmax+xticinterval}"
+      #   set(:xtics, "rotate by #{rotate_xtics}") if rotate_xtics
 
-          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
+      #   set xrange: (xmin-xticinterval)..(xmax+xticinterval)
+      #   set yrange: ymin..ymax
 
-        plot *args 
+      #   args = background ? ["[#{xmin}:#{xmax}] #{ymax} with filledc above y=#{ymin} fc \"##{background}\" notitle", {}] : []
 
-      else
+      #   freqs.each_with_index do |f, i|
+      #     args.push f[0], f[1]
 
-        ###########
-        ### 
-        ###########
-        # 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
+      #     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
 
-        xticinterval = (xmax-xmin).to_f / bins
-        set xrange: 0..((xmax-xmin) / xticinterval).to_i
+      #   plot *args 
 
-        xtics = freqs[0][0]
-        .each.with_index
-        .inject("(") { |result, (x, i)| result += "'#{x-xticinterval/2}-#{x+xticinterval/2}' #{i}," }
-        .gsub(/,$/, ")")
-        set xtics: xtics
+      # else
 
-        labels ||= (0...(freqs.length)).map(&:to_s)
+      #   ###########
+      #   ### 
+      #   ###########
+      #   # 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
 
-        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
+      #   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
 
-        plot *args
+      #   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 # Of if pileup..else
     end # Of Numo.noteplot do
 
   end # Of def function
@@ -203,17 +315,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)
-
-    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
+    file: nil)
 
     Numo.gnuplot do
 
@@ -221,67 +323,84 @@ module Gnutemplate
         set terminal: "gif"
         set output: file
       end
+      
+      args = histogram(data, labels: labels, pileup: pileup,
+      xmin: xmin, xmax: xmax, ymin: ymin, ymax: ymax, bins: bins,
+      figsize: figsize, rotate_xtics: rotate_xtics,
+      fill: fill, alpha: alpha, background: background)
 
-      if pileup
-        ###########
-        ### 
-        ###########
+      plot *args
 
-        set size: "#{figsize},#{figsize}"  
-        set style: "fill solid" if fill
+      # data = [data] if data[0].kind_of?(Numeric) || data[0].nil?
 
-        xticinterval = (xmax-xmin).to_f / bins
-        set xtics: "#{xmin-xticinterval}, #{xticinterval}, #{xmax+xticinterval}"
-        set(:xtics, "rotate by #{rotate_xtics}") if rotate_xtics
+      # 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
 
-        set xrange: (xmin-xticinterval)..(xmax+xticinterval)
-        set yrange: ymin..ymax
+      # if pileup
+      #   ###########
+      #   ### 
+      #   ###########
 
-        args = background ? ["[#{xmin}:#{xmax}] #{ymax} with filledc above y=#{ymin} fc \"##{background}\" notitle", {}] : []
+      #   set size: "#{figsize},#{figsize}"  
+      #   set style: "fill solid" if fill
 
-        freqs.each_with_index do |f, i|
-          args.push f[0], f[1]
+      #   xticinterval = (xmax-xmin).to_f / bins
+      #   set xtics: "#{xmin-xticinterval}, #{xticinterval}, #{xmax+xticinterval}"
+      #   set(:xtics, "rotate by #{rotate_xtics}") if rotate_xtics
 
-          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
+      #   set xrange: (xmin-xticinterval)..(xmax+xticinterval)
+      #   set yrange: ymin..ymax
 
-        plot *args # ,xs, ys, { with: :lines , title: "STD"}  
+      #   args = background ? ["[#{xmin}:#{xmax}] #{ymax} with filledc above y=#{ymin} fc \"##{background}\" notitle", {}] : []
 
-      else
+      #   freqs.each_with_index do |f, i|
+      #     args.push f[0], f[1]
 
-        ###########
-        ### 
-        ###########
-        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
+      #     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
 
-        xticinterval = (xmax-xmin).to_f / bins
-        set xrange: 0..((xmax-xmin) / xticinterval).to_i
+      #   plot *args # ,xs, ys, { with: :lines , title: "STD"}  
 
-        xtics = freqs[0][0]
-        .each.with_index
-        .inject("(") { |result, (x, i)| result += "'#{x-xticinterval/2}-#{x+xticinterval/2}' #{i}," }
-        .gsub(/,$/, ")")
-        set xtics: xtics
+      # else
 
-        labels ||= (0...(freqs.length)).map(&:to_s)
+      #   ###########
+      #   ### 
+      #   ###########
+      #   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
 
-        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
+      #   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
 
-        plot *args
+      #   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 # Of Numo.noteplot do
+      # end # Of if pileup..else
+    end # Of Numo.gnuplot do
 
   end # Of def function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnutemplate
 version: !ruby/object:Gem::Version
-  version: 0.1.8.3
+  version: 0.2.0
 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