ruby-plot 0.6.0 → 0.6.1

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/plot_box.rb

@@ -4,12 +4,14 @@ module RubyPlot
 
   def self.box_plot(path, title, y_lable, names, values)
     
+    check_box_plot_available
+    
     LOGGER.debug "plot box -- names   "+names.inspect
     LOGGER.debug "plot box -- values       "+values.inspect
     
 #    STDOUT.sync = true
     raise if names.length != values.length
-    gnuplot = '/home/martin/software/gnuplot-dev/install/bin/gnuplot'
+    gnuplot = 'gnuplot' 
     
     tmp_datasets = []
     tmp_file = Tempfile.new("data.dat")
@@ -90,6 +92,20 @@ EOF
     
     tmp_datasets.each{|f| f.delete}
   end
+  
+  def self.check_box_plot_available
+    IO.popen('gnuplot --version') do |f| 
+      while line = f.gets
+        if line =~ /^gnuplot ([0-9])+\.([0-9]+)/
+          major = Regexp.last_match(1).to_i
+          minor = Regexp.last_match(2).to_i
+          return true unless ((major==4 and minor<5) or major<4) 
+          raise "gnuplot version < 4.5 ("+line.chomp+")"
+        end  
+      end
+    end
+    raise "could not parse gnuplot version"
+  end
  
   def self.test_plot_box
 #    regression_point_plot("/tmp/regression.png" , "name of title", "x-values", "y-values", ["this-one-has-a-very-very-very-long-name", "test" ], 

data/lib/plot_lines.rb

@@ -23,7 +23,8 @@ module RubyPlot
     
     # gnuplot check
     gnuplot=`which gnuplot | grep -o gnuplot`
-    if gnuplot!="gnuplot\n"
+    #puts gnuplot
+    unless gnuplot =~ /gnuplot/
       raise "Please install gnuplot.\n"+
             "sudo apt-get install gnuplot"
     end
@@ -99,7 +100,11 @@ module RubyPlot
     output_plt_arr.push "set yrange [0:100]"
     output_plt_arr.push "set grid lw 0.5"
     output_plt_arr.push "set title \"#{title}\""
-    output_plt_arr.push "set key below"
+    if plot_data.size>10
+      output_plt_arr.push "set nokey"
+    else
+      output_plt_arr.push "set key below"
+    end
     #output_plt_arr.push "set key invert reverse Left outside"
     output_plt_arr.push "set xlabel \"#{x_lable}\""
     output_plt_arr.push "set ylabel \"#{y_lable}\""

data/lib/plot_points.rb

@@ -192,7 +192,11 @@ module RubyPlot
     
     output_plt_arr.push "set grid lw 0.5"
     output_plt_arr.push "set title \"#{title}\""
-    output_plt_arr.push "set key below"
+    if names.size>10
+      output_plt_arr.push "set nokey"
+    else
+      output_plt_arr.push "set key below"
+    end
     output_plt_arr.push "set xlabel \"#{x_lable}\""
     output_plt_arr.push "set ylabel \"#{y_lable}\""
     
@@ -261,25 +265,25 @@ module RubyPlot
   end
  
   def self.test_plot_points
-#    regression_point_plot("/tmp/regression.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]])
+    regression_point_plot("/tmp/regression.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]])
 #    accuracy_confidence_plot("/tmp/accuracy-conf.png" , "name of title", "x-values", "y-values", ["test" ], 
 #      [[0.9,0.5,0.3,0.1]],
 #      [[100,90,70,30]])
      
-    x = []
-    y = []
-    noise = 0
-    100.times do |i|
-      i += 1
-      noise += rand**2 * (rand<0.5 ? 1 : -1)
-      x << i
-      y << 1/i + noise
-    end
-    confidence_plot("/tmp/test-plot.svg" , "name of title", "x-values", "y-values", ["test"], 
-      [x],
-      [y])
+#    x = []
+#    y = []
+#    noise = 0
+#    100.times do |i|
+#      i += 1
+#      noise += rand**2 * (rand<0.5 ? 1 : -1)
+#      x << i
+#      y << 1/i + noise
+#    end
+#    confidence_plot("/tmp/test-plot.svg" , "name of title", "x-values", "y-values", ["test"], 
+#      [x],
+#      [y])
   end
  
   private

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-plot
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - David Vorgrimmler
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-25 00:00:00 +01:00
+date: 2012-02-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency