gnutemplate 0.1.9 → 0.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fef32d38de9aac460a3999b100fedb69ffa1a95a72589fc196b4dc34385e1bf
-  data.tar.gz: 3ff03c9032f496344d52b28f99e25e6f7440e31b8a617e292871123d0fced7c4
+  metadata.gz: 1f7582d157b2dacffbd2e11ea5b8a6467af3b88f911119e7d0596244e47a75a7
+  data.tar.gz: 15b96ccd899342aeac9f20dbf075ceebb56cd475a32f2753f35e10ef7cc7dc9c
 SHA512:
-  metadata.gz: c6af589bee0cd490502d19f180a5929af1633bd6aae0441856fb8ad7cf3e5de945ecaac27171f31c6e29ba18a668f5784b0036a091a45e6826ca6d2da828fc34
-  data.tar.gz: 466d9643c0fdb0e0697a4afc445da81c1d450dbde07550a62d19ce22e0ac398ac4a3c725454a4a7bd09502f01f980bc963fdcae59c8d404be34d49e055c26a46
+  metadata.gz: face27d0ec1b486841b3ff35ccb67ee90c3750f55ce3b8aef154521ff536c246b1d6de8279b4e7d9924fee4679c62ea5f3dd1b858ac37220d40c82457e8a1b3f
+  data.tar.gz: 497d5aaf03598153f560037c6f6ed842a17abf41f28fb41559bdc9a56774bb4aa115d1dcb9cc56f07e05baa51b7c27854d13c268e7375363d57c7a2738e9f942

data/lib/gnutemplate/version.rb

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

data/lib/gnutemplate.rb

@@ -143,11 +143,6 @@ module Gnutemplate
     fill: true, alpha: 33, background: nil,
     file: nil)
 
-    if !file.nil?
-      set terminal: "gif"
-      set output: file
-    end
-
     data = [data] if data[0].kind_of?(Numeric) || data[0].nil?
 
     alpha_hex = (alpha * 256 / 100).to_s(16).upcase
@@ -185,7 +180,7 @@ module Gnutemplate
         end
       end
 
-      plot *args 
+      return args 
 
     else
 
@@ -215,7 +210,7 @@ module Gnutemplate
         [*f, using: 2, w: :histogram, t: labels[i], fillcolor: "rgb \"#{colors[i % 4]}\""]
       end
 
-      plot *args
+      return args
 
     end # Of if pileup..else
   end
@@ -228,81 +223,90 @@ module Gnutemplate
 
     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
       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
+
+      #   labels ||= (0...(freqs.length)).map(&:to_s)
 
-        plot *args
+      #   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
@@ -313,85 +317,92 @@ module Gnutemplate
     fill: true, alpha: 33, background: nil,
     file: nil)
 
-    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
-
     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)
 
-      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
 
-        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
+
+      #   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
 
-  module_function :note_line, :draw_line, :note_box, :draw_box, :note_histogram, :draw_histogram
+  module_function :note_line, :draw_line, :note_box, :draw_box, :histogram, :note_histogram, :draw_histogram
 end # Of module

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gnutemplate
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0.1
 platform: ruby
 authors:
 - showata