gnutemplate 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfcba5163d0b3ee698d44dcedeb4bdbff59a78cc8d9664cffc9616382a78ccad
-  data.tar.gz: adb0cd61d35455dc9f2f0ffa099d52c3555d128940754e48061e1a64129236f3
+  metadata.gz: c69189fd4dac115b797679a47830cbc77c3c66d593f611ee5192159d331f6bbb
+  data.tar.gz: 77dcfea02ef16af3f38d256802f3cdd583b81bb5cf14ad11f2dc07badf7edec6
 SHA512:
-  metadata.gz: 812ddd1d2c4555ace77903223766260c81e2b933c223d3357fd698372e5c02d9a556e528e5afb659e62ef917403d1913209318e4c9d8db55623df79d49efc7d0
-  data.tar.gz: 2b33faa3748583196db76754df4142bc26835dbd59e1ff7f1e9e90ccc192b73476bf6ceb132b661b40f8e3013de5fa7ab2b5c29b5ad3a7d6b7ead1dc595123ee
+  metadata.gz: 3ebcfa577e172cf2562a5111842ca926248fad462516b7fd6a1c7aaa847a7308b3c2f71fdfa05acf8c043cc55eea4808c04208b283cbfcc76e8fb464d7711733
+  data.tar.gz: 308aca33a72e7900c1195d088529f16a84d7fcd44edbc191a68977a5125ff266e0d3de51a5ad83290572b6d67db4f4f5945a9ac6bd55d71cdfd56dcb92dd6333

data/lib/gnutemplate/version.rb

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

data/lib/gnutemplate.rb

@@ -123,9 +123,9 @@ module Gnutemplate
     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.max
-    xmin ||= data.map(&:to_a).flatten.min
-    freqs = data.map {|d| d.to_a.histogram(bins, min: xmin, max: xmax) }
+    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.noteplot do
@@ -186,9 +186,17 @@ module Gnutemplate
         .gsub(/,$/, ")")
         set xtics: xtics
 
-        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]}\""]
+        labels ||= (0...(freqs.length)).map(&:to_s)
+
+        args = freqs.zip(labels).each_with_index.map do |(f, l), i|
+          [*f, using: 2, :histogram, t: labels[i], fillcolor: "rgb \"#{colors[0 % 4]}\""]
+        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
 
@@ -205,9 +213,9 @@ module Gnutemplate
     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.max
-    xmin ||= data.map(&:to_a).flatten.min
-    freqs = data.map {|d| d.to_a.histogram(bins, min: xmin, max: xmax) }
+    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
@@ -267,9 +275,18 @@ module Gnutemplate
         .gsub(/,$/, ")")
         set xtics: xtics
 
-        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]}\""]
+        labels ||= (0...(freqs.length)).map(&:to_s)
+
+        args = freqs.zip(labels).each_with_index.map do |(f, l), i|
+          [*f, using: 2, :histogram, t: labels[i], fillcolor: "rgb \"#{colors[0 % 4]}\""]
+        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
 

data/todo.txt

@@ -0,0 +1,18 @@
+nilあり対応
+
+散布図
+縦棒 積み上げ縦棒 100%積み上げ縦棒
+パレート図
+ave, max, min, sigma図
+マッピング
+contour + プロット
+縦書き横並びヒスト(JSCが使ってたやつ)
++ demoにあるものでめぼしいものを
+
+※ note, plot 統一 => むずい
+
+・汎用的な重ね方 => クラス化するしかないと思う
+　　　　　　　　　 現在の表記も残す
+・サブプロット 簡易的にするため、同種だけ並べられるようにする。
+
+色 自由指定+ パレット増やす

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnutemplate
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - showata
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2023-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-gnuplot
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Templates of boxplot, histgram, etc.
+description: Templates of boxplot, histogram, etc.
 email:
 - shun_yamaguchi_tc@live.jp
 executables: []
@@ -54,6 +54,7 @@ files:
 - lib/gnutemplate.rb
 - lib/gnutemplate/version.rb
 - sig/gnutemplate.rbs
+- todo.txt
 homepage: https://github.com/show-o-atakun/gnutemplate
 licenses:
 - MIT