numo-gnuplot 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39a3ebbe14ce683f9921fa70f40e60b398f76678
-  data.tar.gz: c2508063acf8dca872ab6c53bd5ae075c379681f
+  metadata.gz: 6d5e544ba0f4909259490066ff280df9562cbc44
+  data.tar.gz: e640abea3b8753a94265fe4c9a1c9bce8eb6b0f5
 SHA512:
-  metadata.gz: a5dee4a5e360d41ea5804845a76b081fa6f8e1c13bd134538a3b618861095b534cb5dad8d844be79b7dc0846703c9bba38c14bad20e65a748e9461531402098f
-  data.tar.gz: 63e12b30cb0e739a6fc5cffb2a3a99300ff3160148be08f1e7c10929699d5c1ec17b0400baf75128137d4e2f0b9761a6a25ee92f83c34a48b6f87f4cc92f6b9a
+  metadata.gz: 8d16164e9871ee7a6b5f8749ed8b06ce83e07992a5ab450dd30350f0b2ca9d4b245ef6c843bdd5eb5582c73f9113cbfd752530e55f7eac025646535b0aaa09a9
+  data.tar.gz: d0bc21a42e7187fb5c1ba79a9cb1f3f1d7dbe8bfba42d4b4d8d26ffba5e503146de3179555778439a64eba34c155090db27ed4622a88e4d833fe907fa5b08e8b

data/lib/numo/gnuplot.rb

@@ -11,7 +11,7 @@ module Numo
 
 class Gnuplot
 
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
   POOL = []
   DATA_FORMAT = "%.5g"
 
@@ -120,7 +120,7 @@ class Gnuplot
   # text display option is disabled.
   #    pause 10
   #    pause 'mouse'
-  #    pause mouse:%w[keypress,button1,button2,button3,close,any]
+  #    pause mouse:%w[keypress button1 button2 button3 close any]
   def pause(*args)
     send_cmd("pause #{OptsToS.new(*args)}").join.chomp
     nil
@@ -542,20 +542,65 @@ class Gnuplot
         s.pack("d*")
       end
     end
+
+    def self.array_shape(a)
+      if a.kind_of?(Array)
+        is_2d = true
+        is_1d = true
+        size_min = nil
+        a.each do |b|
+          if b.kind_of?(Array)
+            is_1d = false
+            if b.any?{|c| c.kind_of?(Array)}
+              is_2d = false
+            elsif size_min.nil? || b.size < size_min
+              size_min = b.size
+            end
+          else
+            is_2d = false
+          end
+          break if !is_1d && !is_2d
+        end
+        if is_1d
+          [a.size]
+        elsif is_2d
+          [a.size, size_min]
+        else
+          kernel_raise GnuplotError, "not suitable Array for data"
+        end
+      elsif a.respond_to?(:shape)
+        a.shape
+      else
+        kernel_raise GnuplotError, "not suitable type for data"
+      end
+    end
   end
 
   # @private
   class SPlotRecord < PlotData  # :nodoc: all
-    def initialize(*data)
-      @shape = data.last.shape
-      super
+
+    def initialize(x,y,z)
+      @text = false
+      @data = [x,y,z].map{|a| a.flatten}
+      @n = @data.map{|a| a.size}.min
+      shape = PlotData.array_shape(z)
+      if shape.size >= 2
+        n = shape[1]*shape[0]
+        if @n < n
+          kernel_raise GnuplotError, "data size mismatch"
+        end
+        @n = n
+        @record = "#{shape[1]},#{shape[0]}"
+      else
+        @record = "#{@n}"
+      end
     end
 
     def cmd_str
       if @text
         "'-'"
       else
-        "'-' binary record=(#{@shape[1]},#{@shape[0]}) format='%float64' using 1:2:3"
+        "'-' binary record=(#{@record}) format='%float64' using 1:2:3"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-gnuplot
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-12 00:00:00.000000000 Z
+date: 2016-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler