grada 1.1.1 → 2.0.0

data/lib/grada/gnuplot.rb

@@ -0,0 +1,226 @@
+require 'matrix'
+
+class NoGnuPlotExecutableFound < RuntimeError; end 
+
+class Gnuplot
+  def self.candidate?(candidate)
+    return candidate if File::executable? candidate
+
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |dir|
+      possible_candidate = File::join dir, candidate.strip
+
+      return possible_candidate if File::executable? possible_candidate
+    end
+
+    nil
+  end
+  
+  def self.find_exec(bin)
+    bin_list = RUBY_PLATFORM =~ /mswin|mingw/ ? [bin, "#{bin}.exe"] : [bin]
+
+    bin_list.each do |c|
+      exec = candidate?(c)
+      return exec if exec
+    end
+
+    nil
+  end
+  
+  def self.gnuplot(persist)
+    gnu_exec = find_exec( ENV['RB_GNUPLOT'] || 'gnuplot' )
+
+    raise NoGnuPlotExecutableFound unless gnu_exec
+
+    "#{gnu_exec} #{'-persist' if persist}"
+  end
+
+  def self.open(persist = true)
+    output = nil
+    gnuplot_cmd = gnuplot(persist)
+
+    IO::popen( gnuplot_cmd, 'w+' ) do |io|
+      yield io
+      io.close_write
+      output = io.read
+    end
+
+    output
+  end
+end
+
+class Plot
+  attr_accessor :cmd, :data, :settings, :arbitrary_lines
+
+  QUOTED_METHODS = [ "title", "output", "xlabel", "x2label", "ylabel", "y2label", "clabel", "cblabel", "zlabel" ]
+
+  def initialize(io = nil, cmd = 'plot')
+    @cmd = cmd
+    @settings = []
+    @arbitrary_lines = []
+    @data = []
+    @styles = []
+    yield self if block_given?
+
+    if io
+      io << to_gplot
+      io << store_datasets
+    end
+  end
+
+  def method_missing(meth, *args)
+    set meth.id2name, *args
+  end
+
+  def set ( var, value = "" )
+    value = "\"#{value}\"" if QUOTED_METHODS.include? var unless value =~ /^'.*'$/
+    @settings << [ :set, var, value ]
+  end
+
+  def unset (var)
+    @settings << [ :unset, var ]
+  end
+
+  def to_gplot(io = '')
+    @settings.each { |setting| io += setting.map(&:to_s).join(' ') + "\n" }
+    @styles.each{ |style| io += style.to_s + "\n" }
+    @arbitrary_lines.each{ |line| io += line + "\n" }
+
+    io
+  end
+
+  def store_datasets(io = '')
+    if @data.size > 0
+      io +=  @cmd + " #{ @data.map { |element| element.plot_args }.join(', ') } \n" 
+      io += @data.map { |ds| ds.to_gplot }.compact.join("e\n")
+    end
+    
+    io
+  end
+
+  def style(&blk)
+    @styles << Style.new(&blk)
+  end
+
+  class Style
+    attr_accessor :linestyle, :linetype, :linewidth, :linecolor, :pointtype, :pointsize, :fill, :index
+
+    alias :ls :linestyle
+    alias :lt :linetype
+    alias :lw :linewidth
+    alias :lc :linecolor
+    alias :pt :pointtype
+    alias :ps :pointsize
+    alias :fs :fill
+
+    STYLES = [:ls, :lt, :lw, :lc, :pt, :ps, :fs]
+
+   def self.increment_index
+     @index ||= 0
+     @index += 1
+   end
+
+   def initialize
+     STYLES.each do |style|
+       send("#{style}=", nil)
+     end
+
+     yield self if block_given?
+
+     self.increment_index
+   end
+
+   def to_s
+     str = "set style line #{@index}"
+
+     STYLES.each do |style|
+       str += " #{send(style)} #{style}" if send(style) 
+     end
+
+     str
+   end
+  end
+end
+
+class DataSet
+  attr_accessor :title, :with, :using, :data, :linewidth, :linecolor, :matrix, :smooth, :axes, :index, :linestyle
+
+  alias :ls :linestyle
+
+  def initialize(data = nil)
+    @data = data
+    @linestyle = nil
+    @title = nil
+    @with = nil
+    @using = nil
+    @linewidth = nil
+    @linecolor = nil 
+    @matrix = nil
+    @smooth = nil
+    @axes = nil
+    @index = nil
+
+    yield self if block_given?
+  end
+
+  def notitle
+    '"No Title"'
+  end
+
+  def plot_args(io = '')
+    io += @data.is_a?(String) ? @data : "'-'"
+    io += " index #{@index}" if @index
+    io += " using #{@using}" if @using
+    io += " axes #{@axes}" if @axes
+    io += " title #{@title ? "\"#{@title}\"" : notitle}"
+    io += " matrix #{@matrix}" if @matrix
+    io += " smooth  #{@smooth}" if @smooth
+    io += " with #{@with}" if @with
+    io += " linecolor #{@linecolor}" if @linecolor
+    io += " linewidth #{@linewidth}" if @linewidth
+    io += " linestyle #{@linestyle.index}" if @linestyle
+    
+    io
+  end
+
+  def to_gplot
+    return nil if @data.nil? || @data.is_a?(String)
+
+    @data.to_gplot
+  end
+end
+
+class Array
+  def to_gplot
+    if number_series?(self)
+      series_for_plot = ''
+      self.each { |elem| series_for_plot += "#{elem}\n" }
+      series_for_plot + 'e'
+    else
+      self[0].zip(self[1]).map{ |elem| elem.join(' ') }.join("\n") + "\ne"
+    end
+  end
+  
+  private 
+  
+  def number_series?(data)
+    data.each do |elem|
+      return false unless elem.is_a?(Numeric)
+    end
+
+    true
+  end
+end
+
+class Matrix
+  def to_gplot
+    matrix_for_plot = ''
+
+    (0...self.column_size).each do |j|
+      (0...self.row_size).each do |i|
+        matrix_for_plot += "#{i} #{j} #{self[j,i]}\n" if self[j,i]
+      end
+    end
+
+    matrix_for_plot
+  end
+end

data/lib/grada.rb

@@ -1,23 +1,23 @@
-require 'gnuplot'
+require 'grada/gnuplot'
 
 class Grada
   # Not valid the format of the object to construct the graph
   #
   class NotValidArrayError < RuntimeError; end
-
+  
   # Not valid the content of the array you're passing to build the graph
   #
   class NotValidDataError < RuntimeError; end
-
+  
   # Can't build the plot
   #
   class NoPlotDataError < RuntimeError; end
-
+  
   attr_reader :x
   attr_reader :y
-
-  DEFAULT_OPTIONS = {width: 1600,
-                     height: 400,
+  
+  DEFAULT_OPTIONS = {width: 1920,
+                     height: 1080,
                      title: "Graph",
                      x_label: "X",
                      y_label: "Y",
@@ -26,7 +26,7 @@ class Grada
   
   # Hello GraDA
   #
-
+  
   def self.hi
     puts "Hello GraDA"
   end
@@ -45,11 +45,10 @@ class Grada
   #   y: (Array) *optional*
   
   def initialize(x, y = nil)
-
     @x = validate(x)
     @y = y.nil? ? y : validate(y)  
   end
- 
+  
   # Displays a graph in a window. 
   # You can specify all the options that you need:
   # *width* (Integer)
@@ -68,7 +67,7 @@ class Grada
   #   => ""
   # Arguments:
   #   opts: (Hash) *optional*
-
+  
   def display(opts = {})
     @opts = DEFAULT_OPTIONS.merge(opts)
     
@@ -91,7 +90,7 @@ class Grada
       end
     end
   end
-
+  
   # Save the graph in a png file. 
   # You can specify all the options that you need as _display_ but also need to specify the file
   #
@@ -111,7 +110,7 @@ class Grada
       
       plot_histogram do |plot|
         plot.output @opts[:filename]
-        plot.set "terminal x11 size #{@opts[:width]},#{@opts[:height]}"
+        plot.set "terminal png size #{@opts[:width]}, #{@opts[:height]} crop"
         plot.terminal 'png'
       end
     elsif @opts[:graph_type] == :heatmap
@@ -120,6 +119,7 @@ class Grada
       
       plot_heat_map do |plot|
         plot.output @opts[:filename]
+        plot.set "terminal png size #{@opts[:width]}, #{@opts[:height]} crop"
         plot.terminal 'png'
       end
     else
@@ -127,7 +127,7 @@ class Grada
       
       plot_and do |plot|
         plot.output @opts[:filename]
-        plot.set "terminal x11 size #{@opts[:width]*10},#{@opts[:height]}"
+        plot.set "terminal png size #{@opts[:width]}, #{@opts[:height]} crop"
         plot.terminal 'png'
       end
     end
@@ -137,7 +137,7 @@ class Grada
   
   def validate(l)
     raise NotValidArrayError if ! l.is_a?(Array)
-
+  
     l.each do |elem|
       raise NotValidDataError if ! ( elem.is_a?(Float) || elem.is_a?(Integer) || elem.is_a?(Array) || elem.is_a?(Hash))
     end
@@ -145,7 +145,7 @@ class Grada
   
   def population_data?(l)
     raise NotValidArrayError if ! l.is_a?(Array)
-
+  
     l.each do |elem|
       raise NotValidDataError if ! ( elem.is_a?(Float) || elem.is_a?(Integer))
     end
@@ -156,7 +156,7 @@ class Grada
       l.each do |elem|
         return false if !  elem.is_a?(Hash)
       end
-
+  
       return true
     end
     
@@ -164,22 +164,22 @@ class Grada
   end
   
   def plot_and(&block)
-    ::Gnuplot.open do |gp|
-      ::Gnuplot::Plot.new(gp) do |plot|
+    Gnuplot.open do |gp|
+      Gnuplot::Plot.new(gp) do |plot|
         block[plot] if block
-
+  
         plot.title @opts[:title]
         
         plot.xlabel @opts[:x_label]
         plot.ylabel @opts[:y_label]
-
+  
         if multiple_data?(@y)
           @y.each do |dic|
             dic.each do |k, v|
               if k.to_sym != :with
                 raise NoPlotDataError if ! v.nil? && @x.size != v.size
             
-                plot.data << ::Gnuplot::DataSet.new([@x,v]) do |ds|
+                plot.data << Gnuplot::DataSet.new([@x,v]) do |ds|
                   ds.with = dic[:with] || @opts[:with]
                   ds.title = "#{k}"
                 end
@@ -189,7 +189,7 @@ class Grada
         else
           raise NoPlotDataError if ! @y.nil? && @x.size != @y.size
           
-          plot.data << ::Gnuplot::DataSet.new([@x,@y]) do |ds|
+          plot.data << Gnuplot::DataSet.new([@x,@y]) do |ds|
             ds.with = @opts[:with] 
           end
         end
@@ -198,19 +198,19 @@ class Grada
   end
   
   def plot_histogram(&block)
-    ::Gnuplot.open do |gp|
-      ::Gnuplot::Plot.new(gp) do |plot|
+    Gnuplot.open do |gp|
+      Gnuplot::Plot.new(gp) do |plot|
         block[plot] if block
-
+  
         plot.title @opts[:title]
         
         plot.set "style data histogram"
         plot.xlabel @opts[:x_label]
         plot.ylabel "Frecuency"
-
+  
         x = @x.sort.group_by { |xi| xi }.map{|k,v| v.count }
         
-        plot.data << ::Gnuplot::DataSet.new(x) do |ds|
+        plot.data << Gnuplot::DataSet.new(x) do |ds|
           ds.with = @opts[:with] 
         end
       end
@@ -218,8 +218,8 @@ class Grada
   end
   
   def plot_heat_map(&block)
-    ::Gnuplot.open do |gp|
-      ::Gnuplot::Plot.new(gp) do |plot|
+    Gnuplot.open do |gp|
+      Gnuplot::Plot.new(gp) do |plot|
         block[plot] if block
         
         plot.set "pm3d map"
@@ -232,9 +232,9 @@ class Grada
         plot.set "palette define"
        
         plot.title @opts[:title]
-        plot.data = [::Gnuplot::DataSet.new(Matrix.columns(@x)) do |ds|
+        plot.data << Gnuplot::DataSet.new(Matrix.columns(@x)) do |ds|
           ds.with = @opts[:with] 
-        end]
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grada
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: gnuplot
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.6.2
 description: Graphic Data Analysis gem
 email: hard_rock15@msn.com
 executables: []
@@ -66,6 +50,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/grada.rb
+- lib/grada/gnuplot.rb
 homepage: https://github.com/emfigo/grada
 licenses: []
 post_install_message: