gnutemplate 0.2.0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f08db55b18fe15eae25c87905d12bb1c1d1c9a35b1f59bca831431ef2c415b72
-  data.tar.gz: 8fec75c071eabf8dc6652e2e9d953ef379bf3782e20e91c97451f3753f6d04ba
+  metadata.gz: b8702141a60cf55e1469b1dc3c614c61ae4e186b82528499b68539f8d26e5e99
+  data.tar.gz: d9e37d34538eff71b66ee6606792dc97a4a6b1af3d8f6f5c23ad156b4651a61c
 SHA512:
-  metadata.gz: cb258e5c419d47df697b56910d8f7e6b6ab965cf7df640971e358c96e9c05c27ebc27e9ea689f3f17444c2e70f5a86a7b53d0f13809019cf0baa3c611a4ab565
-  data.tar.gz: d79bacf208a0f08342250b9efe2770e396b5870525c787a3e6f1dfb5e49066d0d0e7ab0ee767a3c8502304d1ac2d396409f389299e54018a9688abc3151b741e
+  metadata.gz: ee061e613587ab79811aaf9b3aa44841c4073963b0da073791e944696d0a582cba3ff4f985a7dea3d44ddd40e274f6d7b7b87dab1839da1192ddbb11cda9f742
+  data.tar.gz: 4a70f90c8c570cf6ba0bcb3bae0a85701feaab3b3dc829c0edf00c5758c4c15aea55f788df0e77ba4b9caa0e89c5d7e45cf109f5ba72cc831e8098b03e079aae

data/lib/gnutemplate/version.rb

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

data/lib/gnutemplate.rb

@@ -31,6 +31,24 @@ end
 module Gnutemplate
   class Error < StandardError; end
   
+  
+  # settingはむずい
+  # ・全体はハッシュ
+  # ・基本は次のような指定
+  #   settings[:style] = "fill solid" 
+  # ・ハッシュを使う場合も。以下は、set :xtic, :rotate, by: rotate_xtics, scale: 0の表現怜
+  #   settings[:xtic] = {rotate: nil, by: rotate_xtics, scale: 0}
+  # ・同じキー(例えばxtics)に複数指定たいときはリストにして渡す
+  #   settings[:xtics] = ["#{xmin-xticinterval}, #{xticinterval}, #{xmax+xticinterval}" , 
+  #                       "rotate by #{rotate_xtics}"]
+  # ・リストの中を更にハッシュにすることも可能
+  #   settings[:style] = [{data: nil, histogram: nil},   # set :style, :data, :histogram を表現
+  #                       {histogram: nil, cluster: nil, gap: 1},  # set :histogram, :cluster, gap: 1 を表現
+  #                       {fill: nil, solid: 1.0 - (alpha/100.0),  border: -1}]
+
+  
+  SubPlot = Struct.new(:args, :settings)
+  
   def note_line(data)
     Numo.noteplot do
       set xtics: xtics
@@ -104,42 +122,40 @@ module Gnutemplate
     # 列データをmin, maxごとに分離する
     rows_min = (0...(rows.length)).to_a.map {|i| rows[i] if i % 2 == 0}.compact
     rows_max = (0...(rows.length)).to_a.map {|i| rows[i] if i % 2 == 1}.compact
-    
-    Numo.gnuplot do
-      if !file.nil?
-        set terminal: "gif"
-        set output: file
-      end
 
-      if !xtics.nil?
-        set xtics: xtics 
-        set :xtics, "rotate by 90"
-      end
-
-      xrange ||= (rows_min.map(&:to_a).flatten.compact.min)..(rows_max.map(&:to_a).flatten.compact.max)
-      set xrange: xrange
-      set :grid
-      set style: :fill_solid
-      set title: title if title
-
-      ### キャンドルスティックを応用する
-      # X軸, 太い所の最大値, 最大値, 最小値, 太い所の最小値
-      # 今回は細い箇所は不要
-      # X軸はこの場合配列にしなきゃだめ(to_a) これは癖をつけたほうが安全
+    settings = {}
+    args = []
 
-      args = rows_min.zip(rows_max, titlenames).each.with_index.inject([]) do |result, ((mi, ma, t), i)|
-        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
+    if !xtics.nil?
+      set[:xtics] = [xtics]
+      set[:xtics].push "rotate by 90"
+    end
 
-      plot *args
+    xrange ||= (rows_min.map(&:to_a).flatten.compact.min)..(rows_max.map(&:to_a).flatten.compact.max)
+    
+    set[:xrange] = xrange
+    set[:grid] = nil
+    set[:style] = :fill_solid
+    set[:title] = title if title
+
+    ### キャンドルスティックを応用する
+    # X軸, 太い所の最大値, 最大値, 最小値, 太い所の最小値
+    # 今回は細い箇所は不要
+    # 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.to_a, mi.to_a, ma.to_a, ma.to_a, {with: "candlesticks", fc_rgb: colors[i % 4], title: t} ]
     end
+
+    plot *args
+  
   end
 
-  # いずれかはここからargsを返せるようにする
+  # ここからsettings, 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,
+    plotsize: nil, rotate_xtics: 45,
     fill: true, alpha: 33, background: nil,
     file: nil)
 
@@ -154,21 +170,24 @@ module Gnutemplate
     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
+      settings = {}
+      settings[:size] =  "#{plotsize[0]},#{plotsize[1]}" if plotsize
+      settings[:style] = "fill solid" if fill
 
-      args = background ? ["[#{xmin}:#{xmax}] #{ymax} with filledc above y=#{ymin} fc \"##{background}\" notitle", {}] : []
+      settings[:xtics] = ["#{xmin-xticinterval}, #{xticinterval}, #{xmax+xticinterval}"]
+      settings[:xtics].push("rotate by #{rotate_xtics}") if rotate_xtics
+
+      settings[:xrange] = (xmin-xticinterval)..(xmax+xticinterval)
+      settings[:yrange] = ymin..ymax
+
+      args = if background
+        ["[#{xmin}:#{xmax}] #{ymax} with filledc above y=#{ymin} fc \"##{background}\" notitle", {}]
+      else
+        []
+      end
 
       freqs.each_with_index do |f, i|
         args.push f[0], f[1]
@@ -180,29 +199,27 @@ module Gnutemplate
         end
       end
 
-      return args 
+      return SubPlot.new(args, settings)
 
     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
+      settings = {}
+      settings[:auto] = "x"
+      settings[:style] = [{data: nil, histogram: nil},   # set :style, :data, :histogram を表現
+                          {histogram: nil, cluster: nil, gap: 1},  # set :histogram, :cluster, gap: 1 を表現
+                          {fill: nil, solid: 1.0 - (alpha/100.0),  border: -1}]
+      settings[:boxwidth] = 0.9
+      settings[:xtic] = {rotate: nil, by: rotate_xtics, scale: 0}
 
       xticinterval = (xmax-xmin).to_f / bins
-      set xrange: 0..((xmax-xmin) / xticinterval).to_i
+      settings[: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
+      settings[:xtics] = xtics
 
       labels ||= (0...(freqs.length)).map(&:to_s)
 
@@ -210,200 +227,197 @@ module Gnutemplate
         [*f, using: 2, w: :histogram, t: labels[i], fillcolor: "rgb \"#{colors[i % 4]}\""]
       end
 
-      return args
+      return SubPlot.new(args, settings)
 
     end # Of if pileup..else
   end
-  module_function :histogram
 
   def note_histogram(data, labels: nil, pileup: true,
     xmin: nil, xmax: nil, ymin: 0, ymax: nil, bins: 10,
-    figsize: 1.0, rotate_xtics: 45,
+    plotsize: nil, 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
-
-      # 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 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 # Of Numo.noteplot do
-
+    as = Gnutemplate.histogram(data, labels: labels, pileup: pileup,
+    xmin: xmin, xmax: xmax, ymin: ymin, ymax: ymax, bins: bins,
+    plotsize: plotsize, rotate_xtics: rotate_xtics,
+    fill: fill, alpha: alpha, background: background)
+	
+    note as, file: file
+    
   end # Of def function
 
   def draw_histogram(data, labels: nil, pileup: true,
     xmin: nil, xmax: nil, ymin: 0, ymax: nil, bins: 10,
-    figsize: 1.0, rotate_xtics: 45,
+    plotsize: nil, rotate_xtics: 45,
     fill: true, alpha: 33, background: nil,
     file: nil)
 
-    Numo.gnuplot 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
-
-      # data = [data] if data[0].kind_of?(Numeric) || data[0].nil?
+    as = Gnutemplate.histogram(data, labels: labels, pileup: pileup,
+    xmin: xmin, xmax: xmax, ymin: ymin, ymax: ymax, bins: bins,
+    plotsize: plotsize, rotate_xtics: rotate_xtics,
+    fill: fill, alpha: alpha, background: background)
+	
+    draw as, file: file
 
-      # alpha_hex = (alpha * 256 / 100).to_s(16).upcase
-      # colors = ["##{alpha_hex}CC0000", "##{alpha_hex}00CC00", "##{alpha_hex}0000CC", "##{alpha_hex}888800"]
+  end # Of def function
   
-      # 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 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 # ,xs, ys, { with: :lines , title: "STD"}  
-
-      # else
-
-      #   ###########
-      #   ### 
-      #   ###########
-      #   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 # Of Numo.gnuplot do
-
-  end # Of def function
+  def note(subplot, file: nil, campus_size: nil, multicolumn: 1) # for any plot function
+	
+	subplot = [subplot] if !subplot.is_a?(Array)
+	
+	Numo.noteplot do
+
+		if file
+			if campus_size
+				set termnal: "png", size: campus_size
+			else
+				set terminal: "png"
+			end
+			set output: file
+		end
+		
+		# マルチプロット調整
+		multiline = (subplot.length.to_f / multicolumn).ceil
+		set :multiplot, layout: "#{multiline},#{multicolumn}"
+
+		# subplot一つ一つを描画
+		subplot.each do |sp|
+			
+			# こういうのがパターンマッチでできるの？
+			sp.settings.each do |k, v|
+				if v.kind_of?(Hash)
+					sargs = []
+					skwargs = {}
+
+					v.map do |vk, vv|
+						if vv.nil?
+						  sargs.push vk
+						else
+						  skwargs[vk] = vv
+						end
+					end
+				  
+					set k, *sargs, **skwargs
+
+				elsif v.kind_of?(Array)
+
+					v.each do |vi|
+						if vi.kind_of?(Hash)
+						  sargs = []
+						  skwargs = {}
+						  vi.map do |vk, vv|
+                if vv.nil?
+                  sargs.push vk
+                else
+                  skwargs[vk] = vv
+                end
+						  end
+						  set k, *sargs, **skwargs
+						else
+						  set k, vi
+						end
+					end
+				  
+				else
+
+				  if v.nil?
+					  set k
+				  else
+					  set k, v
+				  end
+
+				end
+			end
+
+			plot *(sp.args)
+		end # of subplot.each
+		
+		unset :multiplot
+	  
+	end # of Numo.noteplot
+  end # of def draw
+
+  def draw(subplot, settings, campus_size: nil, file: nil, multicolumn: 1) # for any plot function
+	
+	subplot = [subplot] if !subplot.is_a?(Array)
+	
+	Numo.gnuplot do
+
+		if file
+			if campus_size
+				set termnal: "png", size: campus_size
+			else
+				set terminal: "png"
+			end
+			set output: file
+		end
+		
+		multiline = (subplot.length.to_f / multicolumn).ceil
+		set :multiplot, layout: "#{multiline},#{multicolumn}"
+
+		subplot.each do |sp|
+			
+			# こういうのがパターンマッチでできるの？
+			sp.settings.each do |k, v|
+				if v.kind_of?(Hash)
+				  sargs = []
+				  skwargs = {}
+				  
+				  v.map do |vk, vv|
+            if vv.nil?
+              sargs.push vk
+            else
+              skwargs[vk] = vv
+            end
+				  end
+				  
+				  set k, *sargs, **skwargs
+
+				elsif v.kind_of?(Array)
+
+				  v.each do |vi|
+            if vi.kind_of?(Hash)
+              sargs = []
+              skwargs = {}
+              vi.map do |vk, vv|
+                if vv.nil?
+                  sargs.push vk
+                else
+                  skwargs[vk] = vv
+                end
+              end
+              set k, *sargs, **skwargs
+            else
+              set k, vi
+            end
+				  end
+				  
+				else
+
+				  if v.nil?
+					  set k
+				  else
+					  set k, v
+				  end
+
+				end
+			end
+			
+			plot *(sp.args)
+		
+		end # of subplot.each
+		
+		unset :multiplot
+		
+    end # of Numo.gnuplot
+  end # of def draw
+	
+  module_function :histogram
+  module_function :note_line, :draw_line
+  module_function :note_box, :draw_box
+  module_function :note_histogram, :draw_histogram
+  module_function :note, :draw
 
-  module_function :note_line, :draw_line, :note_box, :draw_box, :note_histogram, :draw_histogram
 end # Of module

metadata

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