numo-gnuplot 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d5e544ba0f4909259490066ff280df9562cbc44
-  data.tar.gz: e640abea3b8753a94265fe4c9a1c9bce8eb6b0f5
+  metadata.gz: e5064afaa692cccf4077c9492ab467cefa3ef796
+  data.tar.gz: 5ffb4ca3e9186be9f407d78574c6d3a1c28f9967
 SHA512:
-  metadata.gz: 8d16164e9871ee7a6b5f8749ed8b06ce83e07992a5ab450dd30350f0b2ca9d4b245ef6c843bdd5eb5582c73f9113cbfd752530e55f7eac025646535b0aaa09a9
-  data.tar.gz: d0bc21a42e7187fb5c1ba79a9cb1f3f1d7dbe8bfba42d4b4d8d26ffba5e503146de3179555778439a64eba34c155090db27ed4622a88e4d833fe907fa5b08e8b
+  metadata.gz: 270d969fb495edcbcbaef29c48e4047e1d9b9e501ed027203109534ee89fcde62fcef8eb945fa7b92a4c8d29d47a7a01bb2ef142edb3422e4ab7e87867ec14ec
+  data.tar.gz: 0f88298db5e01193da0fc5aa848c56f3b98b365b798192d9bd5d8fcf091b644bd18ae0888a91f5b2ec52a9831d9dd94da77daa813eee726786a2f4536f136500

data/lib/numo/gnuplot.rb

@@ -11,9 +11,9 @@ module Numo
 
 class Gnuplot
 
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
   POOL = []
-  DATA_FORMAT = "%.5g"
+  DATA_FORMAT = "%.7g"
 
   class GnuplotError < StandardError; end
 
@@ -419,7 +419,7 @@ class Gnuplot
       elsif defined?(::NArray)
         return true if a.kind_of?(::NArray)
       elsif defined?(::NMatrix)
-        return true if a.kind_of?(::NMatix)
+        return true if a.kind_of?(::NMatrix)
       end
       false
     end
@@ -514,7 +514,7 @@ class Gnuplot
     def initialize(*data)
       @data = data.map{|a| a.flatten}
       @n = @data.map{|a| a.size}.min
-      @text = false
+      @text = true
     end
 
     def cmd_str
@@ -527,10 +527,9 @@ class Gnuplot
 
     def data_str
       if @text
-        f = ([data_format]*@data.size).join(" ")+"\n"
         s = ""
-        @n.times{|i| s << f % @data.map{|a| a[i]}}
-        s+"\ne"
+        @n.times{|i| s << line_str(i)+"\n"}
+        s + "e"
       elsif defined? Numo::NArray
         m = @data.size
         x = Numo::DFloat.zeros(@n,m)
@@ -543,6 +542,26 @@ class Gnuplot
       end
     end
 
+    def line_str(i)
+      @data.map do |a|
+        v = a[i]
+        case v
+        when Float,Rational
+          s = data_format % v
+        when Numeric
+          s = v.to_s
+        else
+          s = v.to_s
+          if /"/ =~ s
+            kernel_raise GnuplotError,"should not include double quotation in data"
+          elsif / / =~ s
+            s = '"'+s+'"'
+          end
+        end
+        s
+      end.join(" ")
+    end
+
     def self.array_shape(a)
       if a.kind_of?(Array)
         is_2d = true

metadata

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