numo-gnuplot 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 207eee52a40503388116fc6745dfc547abb4ae4b
-  data.tar.gz: 87f57e24d3f81c0a2b134473307c11efc9744df1
+  metadata.gz: 1bea55aa439ccecdaa82be80cac6ecc3e55e2a78
+  data.tar.gz: 3ba14d97891fbc339afcf79dd20f6bfad7b85f17
 SHA512:
-  metadata.gz: a30b8b85142e87bec88504dcc573d4ac0e367587c4cc0a97da21347a0af3efc09a989c4ae0d71970f617c98229415ea12a281c9670cadc08f09a5afd157573e1
-  data.tar.gz: d07566c07f3f1f3366e41e74f80a531fdd440b4fc001461c97034a7f5fe3d5efa6aa21023fd994d9a1ae25dcc9115a3928926fac7e4f0dccc41c1b766e325138
+  metadata.gz: c7edf347b3c9c63622da94fc7e75205f26a55f2b2a52520b4b03c4555ed97fb191ee0941d9e0a554232d021e7f00ab1e0a45deff8bdffd684002dfabf5abb260
+  data.tar.gz: 5682b191f24182db3255b25f748ab4fe0950f5dfda67b7b0169ce69a77b965b22057695566b6e29e868a11ce3b06d24835bf6fb006e2a7f82df2c40d0911cd07

data/README.md

@@ -1,5 +1,26 @@
 # Numo::Gnuplot : Gnuplot interface for Ruby
 
+<div class="row">
+<a href=https://github.com/ruby-numo/gnuplot-demo/blob/master/gnuplot/md/006histograms/README.md>
+<img src="https://raw.githubusercontent.com/ruby-numo/gnuplot-demo/master/gnuplot/md/006histograms/image/006.png" height="135" width="135">
+</a>
+<a href=https://github.com/ruby-numo/gnuplot-demo/blob/master/gnuplot/md/501rainbow/README.md>
+<img src="https://raw.githubusercontent.com/ruby-numo/gnuplot-demo/master/gnuplot/md/501rainbow/image/002.png" height="135" width="135">
+</a>
+<a href=https://github.com/ruby-numo/gnuplot-demo/blob/master/gnuplot/md/603finance/README.md>
+<img src="https://raw.githubusercontent.com/ruby-numo/gnuplot-demo/master/gnuplot/md/603finance/image/013.png" height="135" width="135">
+</a>
+<a href=https://github.com/ruby-numo/gnuplot-demo/blob/master/gnuplot/md/502rgb_variable/README.md>
+<img src="https://raw.githubusercontent.com/ruby-numo/gnuplot-demo/master/gnuplot/md/502rgb_variable/image/006.png" height="135" width="135">
+</a>
+<a href=https://github.com/ruby-numo/gnuplot-demo/blob/master/gnuplot/md/207hidden2/README.md>
+<img src="https://raw.githubusercontent.com/ruby-numo/gnuplot-demo/master/gnuplot/md/207hidden2/image/001.png" height="135" width="135">
+</a>
+<a href=https://github.com/ruby-numo/gnuplot-demo/blob/master/gnuplot/md/905transparent_solids/README.md>
+<img src="https://raw.githubusercontent.com/ruby-numo/gnuplot-demo/master/gnuplot/md/905transparent_solids/image/002.png" height="135" width="135">
+</a>
+</div>
+
 Alpha version under development.
 
 * [GitHub site](https://github.com/ruby-numo/gnuplot)

data/lib/numo/gnuplot.rb

@@ -18,7 +18,7 @@ module Numo
 
 class Gnuplot
 
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
   POOL = []
   DATA_FORMAT = "%.7g"
 
@@ -92,13 +92,14 @@ class Gnuplot
     c = contents.map{|x| x.cmd_str}.join(", ")
     d = contents.map{|x| x.data_str}.join
     run "#{cmd} #{r}#{c}", d
+    @last_data = d
     nil
   end
   private :_plot_splot
 
   # replot is not recommended, use refresh
   def replot(arg=nil)
-    run "replot #{arg}\n#{@last_data}"
+    run "replot #{arg}", @last_data
     nil
   end
 
@@ -118,13 +119,13 @@ class Gnuplot
   # in the `fit`section).  This is useful for saving the current
   # values for later use or for restarting a converged or stopped fit.
   def update(*filenames)
-    puts send_cmd("update "+filenames.map{|f| OptArg.squote(f)}.join(" "))
+    puts send_cmd("update "+filenames.map{|f| OptArg.quote(f)}.join(" "))
   end
 
   # This command prepares a statistical summary of the data in one or
   # two columns of a file.
   def stats(filename,*args)
-    fn = OptArg.squote(filename)
+    fn = OptArg.quote(filename)
     opt = OptArg.parse(*args)
     puts send_cmd "stats #{fn} #{opt}"
   end
@@ -171,7 +172,7 @@ class Gnuplot
 
   # The `load` command executes each line of the specified input file.
   def load(filename)
-    run "load #{OptArg.squote(filename)}"
+    run "load #{OptArg.quote(filename)}"
     nil
   end
 
@@ -294,7 +295,7 @@ class Gnuplot
         return nil
       end
       if res.size < 7
-        if res.all?{|x| /^\s*(line \d+: )?warning:/i =~ x}
+        if /^\s*(line \d+: )?warning:/i =~ res[0]
           $stderr.puts res.join.strip
           return nil
         else
@@ -426,7 +427,7 @@ class Gnuplot
     when 2
       "[#{a[0]}:#{a[1]}]"
     else
-      raise ArgumetError,"wrong number of argument"
+      kernel_raise ArgumentError,"wrong number of argument"
     end
   end
   private :range_to_s
@@ -498,6 +499,10 @@ class Gnuplot
             if opts.first.kind_of?(String)
               a << OptArg.quote(opts.shift)
             end
+          when NEED_QUOTE_TIME
+            if opts.first.kind_of?(String)
+              a << OptArg.quote_time(opts.shift)
+            end
           when NEED_QUOTE
             if opts.first.kind_of?(String)
               a << OptArg.quote(opts.shift)
@@ -516,6 +521,12 @@ class Gnuplot
       a.join(sep)
     end
 
+    NEED_QUOTE_TIME = /^timef(mt?)?/
+
+    def quote_time(s)
+      "'#{s}'"
+    end
+
     NEED_QUOTE = %w[
       background
       cblabel
@@ -561,24 +572,10 @@ class Gnuplot
 
     def quote(s)
       case s
-      when String
-        if /^'(.*)'$/ =~ s || /^"(.*)"$/ =~ s
-          s = $1
-        end
-        s.inspect
-      else
+      when /^('.*'|".*")$/
         s
-      end
-    end
-
-    def squote(s)
-      case s
       when String
-        if /^'.*'$/ =~ s || /^".*"$/ =~ s
-          s
-        else
-          "'#{s}'"
-        end
+        s.inspect
       else
         s
       end
@@ -613,6 +610,8 @@ class Gnuplot
         else
           "#{k} #{parse(v)}"
         end
+      when NEED_QUOTE_TIME
+        "#{k} #{OptArg.quote_time(v)}"
       when NEED_QUOTE
         case v
         when String
@@ -677,13 +676,24 @@ class Gnuplot
           t = Numeric if t < Numeric
           return a.all?{|e| e.kind_of?(t)}
         end
-      elsif defined?(Numo::NArray)
+      end
+      if defined?(Numo::NArray)
         return true if a.kind_of?(Numo::NArray)
-      elsif defined?(::NArray)
+      end
+      if defined?(::NArray)
         return true if a.kind_of?(::NArray)
-      elsif defined?(::NMatrix)
+      end
+      if defined?(::NMatrix)
         return true if a.kind_of?(::NMatrix)
       end
+      case a[a.size-1] # quick check for unknown data class
+      when Numeric
+        return true if a[0].kind_of?(Numeric)
+      when String
+        return true if a[0].kind_of?(String)
+      end
+      false
+    rescue
       false
     end
 
@@ -703,13 +713,13 @@ class Gnuplot
       if !@options
         if @items.empty?
           return
-        elsif @items.first.kind_of? String
+        elsif @items.first.kind_of?(String) || @items.first.kind_of?(Symbol)
           @function = @items.first
           @options = @items[1..-1]
           if (o=@items.last).kind_of? Hash
             if o.any?{|k,v| /^#{k}/ =~ "using"}
               # @function is data file
-              @function = OptArg.squote(@function)
+              @function = OptArg.quote(@function)
             end
           end
         else
@@ -793,7 +803,7 @@ class Gnuplot
     end
 
     def cmd_str
-      "%s %s %s" % [@expression, OptArg.squote(@datafile), OptArg.parse(*@items)]
+      "%s %s %s" % [@expression, OptArg.quote(@datafile), OptArg.parse(*@items)]
     end
   end
 
@@ -819,7 +829,7 @@ class Gnuplot
       if data.empty?
         raise ArgumentError,"no data"
       end
-      @data = data.map{|a| a.flatten}
+      @data = data.map{|a| a.respond_to?(:flatten) ? a.flatten : a}
       @n = @data.map{|a| a.size}.min
       @text = true
     end
@@ -832,6 +842,15 @@ class Gnuplot
       end
     end
 
+    def as_array(a)
+      case a
+      when Numo::NArray,Array
+        a
+      else
+        a.to_a
+      end
+    end
+
     def data_str
       if @text
         s = ""
@@ -840,7 +859,7 @@ class Gnuplot
       elsif defined? Numo::NArray
         m = @data.size
         x = Numo::DFloat.zeros(@n,m)
-        m.times{|i| x[true,i] = @data[i][0...@n]}
+        m.times{|i| x[true,i] = as_array(@data[i])[0...@n]}
         x.to_string
       else
         s = []
@@ -851,22 +870,27 @@ class Gnuplot
 
     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
+        PlotData.quote_data(a[i])
+      end.join(" ")
+    end
+
+    def self.quote_data(v)
+      case v
+      when Float,Rational
+        DATA_FORMAT % v
+      when Numeric
+        v.to_s
+      else
+        s = v.to_s.gsub(/\n/,'\n')
+        if /^(e|.*[ \t].*)$/ =~ s
           if /"/ =~ s
-            kernel_raise GnuplotError,"should not include double quotation in data"
-          else
-            s = '"'+s+'"'
+            raise GnuplotError,"Datastrings cannot include"+
+              " double quotation and space simultaneously"
           end
+          s = '"'+s+'"'
         end
         s
-      end.join(" ")
+      end
     end
 
     def self.array_shape(a)
@@ -892,12 +916,14 @@ class Gnuplot
         elsif is_2d
           [a.size, size_min]
         else
-          kernel_raise GnuplotError, "not suitable Array for data"
+          raise GnuplotError, "not suitable Array for data"
         end
       elsif a.respond_to?(:shape)
         a.shape
+      elsif PlotItem.is_data(a)
+        [a.size]
       else
-        kernel_raise GnuplotError, "not suitable type for data"
+        raise GnuplotError, "not suitable type for data"
       end
     end
   end
@@ -907,13 +933,13 @@ class Gnuplot
 
     def initialize(x,y,z)
       @text = false
-      @data = [x,y,z].map{|a| a.flatten}
+      @data = [x,y,z].map{|a| a.respond_to?(:flatten) ? a.flatten : a}
       @n = @data.map{|a| a.size}.min
-      shape = PlotData.array_shape(z)
+      shape = PlotData.array_shape(@data[2])
       if shape.size >= 2
         n = shape[1]*shape[0]
         if @n < n
-          kernel_raise GnuplotError, "data size mismatch"
+          raise GnuplotError, "data size mismatch"
         end
         @n = n
         @record = "#{shape[1]},#{shape[0]}"
@@ -997,14 +1023,14 @@ class Gnuplot
           s << b.map{|e| f%e}.join(" ")+"\n"
         end
         s+"\ne"
-      elsif defined? Numo::NArray
-        if @data.kind_of?(Numo::NArray)
-          @data.to_string
-        else
-          Numo::DFloat.cast(@data).to_string
-        end
-      else
+      elsif defined? Numo::NArray && @data.kind_of?(Numo::NArray)
+        @data.to_string
+      elsif @data.kind_of?(Array)
         @data.pack("d*")
+      elsif @data.repond_to?(:to_a)
+        @data.to_a.pack("d*")
+      else
+        raise TypeError,"invalid data type: #{@data.class}"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-gnuplot
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler