ruby-plot 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/plot_bars.rb

@@ -14,7 +14,14 @@ module RubyPlot
           string += '"' + measures[i-1] + '" ' + i.to_s + ".00000 -1 "
         end
   
-        plot.terminal 'svg size 800,600 dynamic enhanced fname "Arial" fsize 12 butt'         
+        if output_file=~/(?i)svg/
+          plot.terminal 'svg size 800,600 dynamic enhanced fname "Arial" fsize 12 butt'
+        elsif output_file=~/(?i)png/
+          plot.terminal 'png'
+        else
+          raise "format not supported "+path.to_s
+        end
+  
         plot.output   output_file
         plot.bar    '1.000000'
         plot.boxwidth '0.9 absolute'
@@ -58,6 +65,10 @@ module RubyPlot
     x = ['ACC_with_very_long_name_consider_that', 'AUC', 'SPEC', 'SENS']
     data = [['Alg1', 1.00, 1.00, 1.00, 1.00], ['Alg2', 0.75, 0.75, 0.75, 0.75], ['Alg3', 0.50, 0.50, 0.50, 0.50]]
     plot_bars('Vergleich der Algorithmen', x, data, '/tmp/hist.svg')
+    
+    x = ['ACC_with_very_long_name_consider_that', 'AUC', 'SPEC', 'SENS']
+    data = [['Alg1', 1.00, 1.00, 1.00, 1.00], ['Alg2', 0.75, 0.75, 0.75, 0.75], ['Alg3', 0.50, 0.50, 0.50, 0.50]]
+    plot_bars('Vergleich der Algorithmen', x, data, '/tmp/hist.png')
   end
   
 end

data/lib/plot_lines.rb

@@ -8,7 +8,7 @@
 
 module RubyPlot
 
-  def self.plot_lines(svg_path, title, x_lable, y_lable, names, x_values, y_values, faint=nil)
+  def self.plot_lines(path, title, x_lable, y_lable, names, x_values, y_values, faint=nil)
     
     #LOGGER.debug names.inspect
     #LOGGER.debug x_values.inspect
@@ -37,7 +37,7 @@ module RubyPlot
     end
     
     if status
-      raise "Usage: svg_roc_plot (svg_path(?), title(string), x-lable(string), y-lable(sting), algorithms(array), true_pos_data1(array), false_pos_data1(array), ...,  true_pos_data_n(array), false_pos_data_n(array))\n"+
+      raise "Usage: svg_roc_plot (path(?), title(string), x-lable(string), y-lable(sting), algorithms(array), true_pos_data1(array), false_pos_data1(array), ...,  true_pos_data_n(array), false_pos_data_n(array))\n"+
             "       Only pairs of data are allowed but at least one.\n"+
             "       Each data array has to provide one float/int number from 0 to 100 per entry."
     end
@@ -103,11 +103,20 @@ module RubyPlot
     output_plt_arr.push "# Specifies encoding and output format"
     output_plt_arr.push "set encoding default"
     #output_plt_arr.push "set terminal svg"
-    output_plt_arr.push 'set terminal svg size 800,600 dynamic enhanced fname "Arial" fsize 12 butt'
-    output_plt_arr.push "set output '#{svg_path}'"
+    if path=~/(?i)svg/
+      output_plt_arr.push 'set terminal svg size 800,600 dynamic enhanced fname "Arial" fsize 12 butt'
+    elsif path=~/(?i)png/
+      output_plt_arr.push 'set terminal png'
+    else
+      raise "format not supported "+path.to_s
+    end
+    output_plt_arr.push "set output '#{path}'"
     output_plt_arr.push ""
     output_plt_arr.push "# Specifies the range of the axes and appearance"
     
+    # x and y have equal scale
+    output_plt_arr.push 'set size ratio -1'
+
     output_plt_arr.push "set xrange [0:100]"
     output_plt_arr.push "set yrange [0:100]"
     output_plt_arr.push "set grid lw 0.5"
@@ -157,7 +166,7 @@ module RubyPlot
     end
     raise "gnuplot failes (cmd: "+cmd.to_s+", out: "+response.to_s+")" unless $?==0
     
-    LOGGER.debug "#{svg_path} created. "
+    LOGGER.debug "#{path} created. "
     
     # -----------------------------------------------------
     # remove *.plt and *.dat files
@@ -172,6 +181,8 @@ module RubyPlot
  
   def self.test_plot_lines
     plot_lines("/tmp/result.svg" , "name of title", "x-values", "y-values", ["name", "test", "bla"], [[20,60,80], [10,25,70,95], [12,78,99]], [[15,50,90],[20,40,50,70],[34,89,89]],[true,false,true])
+    
+    plot_lines("/tmp/result.png" , "name of title", "x-values", "y-values", ["name", "test", "bla"], [[20,60,80], [10,25,70,95], [12,78,99]], [[15,50,90],[20,40,50,70],[34,89,89]],[true,false,true])
   end
  
   private

data/lib/plot_points.rb

@@ -8,16 +8,27 @@
 
 module RubyPlot
 
-  def self.plot_points(svg_path, title, x_lable, y_lable, names, x_values, y_values)
+  def self.plot_points(path, title, x_lable, y_lable, names, x_values, y_values, log=true)
     
-    LOGGER.debug names.inspect
-    LOGGER.debug x_values.inspect
-    LOGGER.debug y_values.inspect
+    LOGGER.debug "ruby-plot: plot points "+names.inspect
+    LOGGER.debug "ruby-plot: plot points "+x_values.inspect
+    LOGGER.debug "ruby-plot: plot points "+y_values.inspect
+    
+    min = Float::MAX
+    max = -Float::MAX
     
     data = []
     (0..x_values.size-1).each do |i|
       data << y_values[i]
       data << x_values[i]
+      
+      min = [ min, x_values[i].min, y_values[i].min ].min
+      max = [ max, x_values[i].max, y_values[i].max ].max
+    end
+    
+    if log && min<=0
+      LOGGER.warn "cannot use logscale for <=0 data"
+      log = false
     end
     
     #Main
@@ -37,7 +48,7 @@ module RubyPlot
     end
     
     if status
-      raise "Usage: svg_roc_plot (svg_path(?), title(string), x-lable(string), y-lable(sting), algorithms(array), true_pos_data1(array), false_pos_data1(array), ...,  true_pos_data_n(array), false_pos_data_n(array))\n"+
+      raise "Usage: svg_roc_plot (path(?), title(string), x-lable(string), y-lable(sting), algorithms(array), true_pos_data1(array), false_pos_data1(array), ...,  true_pos_data_n(array), false_pos_data_n(array))\n"+
             "       Only pairs of data are allowed but at least one.\n"+
             "       Each data array has to provide one float/int number from 0 to 100 per entry."
     end
@@ -102,20 +113,47 @@ module RubyPlot
     output_plt_arr = Array.new
     output_plt_arr.push "# Specifies encoding and output format"
     output_plt_arr.push "set encoding default"
-    #output_plt_arr.push "set terminal svg"
-    output_plt_arr.push 'set terminal svg size 800,600 dynamic enhanced fname "Arial" fsize 12 butt'
-    output_plt_arr.push "set output '#{svg_path}'"
+    
+    if path=~/(?i)svg/
+      output_plt_arr.push 'set terminal svg size 800,600 dynamic enhanced fname "Arial" fsize 12 butt'
+    elsif path=~/(?i)png/
+      output_plt_arr.push 'set terminal png'
+    else
+      raise "format not supported "+path.to_s
+    end
+    # x and y have equal scale
+    output_plt_arr.push 'set size ratio -1'
+    
+    if log
+      output_plt_arr.push 'set logscale x'
+      output_plt_arr.push 'set logscale y'
+    end
+    
+    output_plt_arr.push "set output '#{path}'"
     output_plt_arr.push ""
     output_plt_arr.push "# Specifies the range of the axes and appearance"
     
-    #output_plt_arr.push "set xrange [0:100]"
-    #output_plt_arr.push "set yrange [0:100]"
+    border = (max-min)*0.1
+    if log
+      min_border = min-border/10.0
+      while min_border<=0
+        border /= 2
+        min_border = min-border/10.0
+      end
+      max_border = max+border
+    else
+      min_border = min-border
+      max_border = max+border
+    end
+    output_plt_arr.push "set xrange ["+min_border.to_s+":"+max_border.to_s+"]"
+    output_plt_arr.push "set yrange ["+min_border.to_s+":"+max_border.to_s+"]"
+    
     output_plt_arr.push "set grid lw 0.5"
     output_plt_arr.push "set title \"#{title}\""
     output_plt_arr.push "set key below"
     output_plt_arr.push "set xlabel \"#{x_lable}\""
     output_plt_arr.push "set ylabel \"#{y_lable}\""
-    #output_plt_arr.push "set arrow to 1,1 nohead"
+    #output_plt_arr.push "set arrow from "+min.to_s+","+min.to_s+" to "+max.to_s+","+max.to_s+" nohead"
     output_plt_arr.push ""
     output_plt_arr.push ""
     output_plt_arr.push ""
@@ -156,7 +194,7 @@ module RubyPlot
     end
     raise "gnuplot failes (cmd: "+cmd.to_s+", out: "+response.to_s+")" unless $?==0
     
-    LOGGER.debug "#{svg_path} created. "
+    LOGGER.debug "#{path} created. "
     
     # -----------------------------------------------------
     # remove *.plt and *.dat files
@@ -170,7 +208,9 @@ module RubyPlot
   end
  
   def self.test_plot_points
-    plot_points("/tmp/result.svg" , "name of title", "x-values", "y-values", ["this-one-has-a-very-very-very-long-name", "test" ], [[0.20,0.60,0.80], [0.10,0.25,0.70,0.95]], [[0.15,0.50,0.90],[0.20,0.40,0.50,0.70]])
+    plot_points("/tmp/result.png" , "name of title", "x-values", "y-values", ["this-one-has-a-very-very-very-long-name", "test" ], 
+      [[0.20,0.60,0.80,0.20,1.0,0.001], [0.10,0.25,0.70,0.95,0.2,0.3434]], 
+      [[0.15,0.50,0.90,0.2,9,0.5],[0.20,0.40,0.50,0.70,0.3,0.234589]])
   end
  
   private

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-plot
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  hash: 25
+  prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - David Vorgrimmler
@@ -10,19 +16,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 +02:00
+date: 2011-05-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gnuplot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: ""
 email: vorgrimmlerdavid@gmx.de
 executables: []
@@ -44,26 +54,32 @@ homepage: http://github.com/davor/ruby-plot
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: gnuplot wrapper for ruby, especially for plotting roc curves into svg files