analyzer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51beba34588f8acce4c871ade9f58bb256630d65
-  data.tar.gz: fe3874d888ca0cf952486c7570720c38e73a872f
+  metadata.gz: e259fae5d2c7856aa73eb2dc95d00b8502cfbd8f
+  data.tar.gz: f0181107ebad07e8eaffa3ff91a8ccd1aab81ec8
 SHA512:
-  metadata.gz: 19017d89459ce25bdc071b8299c0b4c0d934dcb17e67d5d9efd5cd86aae105268813e06a6e82758ceb1fbde6b836d9e24ac3fdb8604496f73e3fb1982ef4dac3
-  data.tar.gz: a88520e9a8387fa159eb389018f468f79c1eb0408d716e37ba550d37f59aaf2bcb6d393b1d5e1c00488a8a751bec6eb6e6be9ca63d152b676760e7a7a2274821
+  metadata.gz: ddc63be7d1aece7cadda916383358c18b4736b8583c0fe9d61fc905850a0a0abdcc2c8ec2c56130c5da8e45864357df9f5fcff61e4e29dc6b647cf2d1caaf031
+  data.tar.gz: fec1115edac0d704df03549205f15bd6d16f0f4239652b9774150b234d2adb5b2410852102d770b1894361f18985d5b7d7be326646e9b2bd44426ae9c04454a7

data/bin/analyze

@@ -14,7 +14,7 @@ OptionParser.new do |opts|
     options[:lib] = v
   end
 
-  opts.on("-n x,y,z", Array, "Example 'list' of arguments") do |list|
+  opts.on("-n x,y,z", Array, "A paramater N that will be defined in the test. Each test will run once for each N") do |list|
     options[:n] = list.map(&:to_i)
   end
   

data/lib/analyzer.rb

@@ -1,18 +1,26 @@
 require 'erb'
 require 'json'
 require 'tmpdir'
+require 'fileutils'
 
 class Analyzer
   
   def initialize(*test_files, bootstrap: nil, lib: nil, n: nil)
     @bootstrap = bootstrap
     @lib = lib
-    @n = n
+    @n = n || [1]
     @test_files = test_files
+    
+    @keys = test_files.map { |fn| File.basename(fn, '.*') }
+    depth = -1
+    while @keys.uniq.length < @keys.length
+      @keys = test_files.map { |fn| ( File.dirname(fn).split(File::SEPARATOR)[depth..-1] + [File.basename(fn, '.*')] ).join(File::SEPARATOR) }
+      depth -= 1
+    end
   end
   
   def key(value)
-    File.basename(value, ".*")
+    @keys[@test_files.index(value)]
   end
   
   def tests
@@ -29,23 +37,24 @@ class Analyzer
   end
 
   def write_results_for(type, dir)
-    Dir.mkdir(File.join(dir, type))
-    @test_files.each do |src|
-      File.open(File.join(dir, type, key(src)), 'w') do |file|
-        send(:"output_#{type}_results", calculate_results_for(type, File.read(src)), file)
+    @n.each do |n|
+      FileUtils.mkdir_p(File.join(dir, type, n.to_s))
+      @test_files.each do |src|
+        File.open(File.join(dir, type, n.to_s, key(src)), 'w') do |file|
+          send(:"output_#{type}_results", calculate_results_for(type, File.read(src), n), file)
+        end
       end
     end
   end
 
-  def calculate_results_for(type, src)
+  def calculate_results_for(type, src, n=1)
     lib = @lib ? File.read(File.expand_path(@lib)) : ''
+    setup = "N=#{n}\n"
     
     if src.index("\n__SETUP__\n")
       src = src.split("\n__SETUP__\n")
-      setup = src[0]
+      setup << src[0]
       src = src[1]
-    else
-      setup = ''
     end
     
     analyzer_dir = File.expand_path("../", __FILE__)

data/lib/analyzer/version.rb

@@ -1,3 +1,3 @@
 class Analyzer
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/templates/gnuplot.sh.erb

@@ -40,7 +40,8 @@ set style boxplot range 2 nooutliers candlesticks
 set style fill solid 0.2
 set xtics (<%= tests.map.with_index { |f, i| "'#{escape(f)}' #{i+1}"}.join(', ') %>) scale 0,0
 
-plot <%= tests.map.with_index { |t, i| "'#{File.join(data_dir, 'ips', t)}' using (#{i+1}.0):1 with boxplot linestyle #{i+1}" }.join(', ') %>
+plot \
+<% @n.each_with_index do |n, ni| %><% tests.each_with_index do |t, i| %>'<%= File.join(data_dir, 'ips', n.to_s, t) %>' using (<%= i+1 %>.0):1 title '<%= escape(t) + (@n.size == 1 ? '' : " #{n}" ) %>' with boxplot linestyle <%= i +1 %> dt <%= ni+1 %><%= tests.size == i+1 && @n.last == n ? '' : ", \\\n" %><% end %><% end %>
 
 
 set title "GC Objects Allocated"
@@ -49,22 +50,24 @@ set yrange [0:*]
 set xrange [0:5]
 set xtics autofreq
 
-
-plot <%= tests.map.with_index { |k, i| "'#{File.join(data_dir, 'gc', k)}' using 2:5 title '#{escape(k)}' with steps linestyle #{i+1}" }.join(', ') %>
+plot \
+<% @n.each_with_index do |n, ni| %><% tests.each_with_index do |t, i| %>'<%= File.join(data_dir, 'gc', n.to_s, t) %>' using 2:5 title '<%= escape(t) + (@n.size == 1 ? '' : " #{n}" ) %>' with steps linestyle <%= i +1 %> dt <%= ni+1 %><%= tests.size == i+1 && @n.last == n  ? '' : ", \\\n" %><% end %><% end %>
 
 set title "GC Objects Freed"
 set key on
 set yrange [0:*]
 set xrange [0:5]
 
-plot <%= tests.map.with_index { |k, i| "'#{File.join(data_dir, 'gc', k)}' using 2:6 title '#{escape(k)}' with steps linestyle #{i+1}" }.join(', ') %>
+plot \
+<% @n.each_with_index do |n, ni| %><% tests.each_with_index do |t, i| %>'<%= File.join(data_dir, 'gc', n.to_s, t) %>' using 2:6 title '<%= escape(t) + (@n.size == 1 ? '' : " #{n}" ) %>' with steps linestyle <%= i +1 %> dt <%= ni+1 %><%= tests.size == i+1 && @n.last == n  ? '' : ", \\\n" %><% end %><% end %>
 
 set title "GC Retained"
 set key on
 set yrange [0:*]
 set xrange [0:5]
 
-plot <%= tests.map.with_index { |k, i| "'#{File.join(data_dir, 'gc', k)}' using 2:(\\$3-\\$4) title '#{escape(k)}' with steps linestyle #{i+1}" }.join(', ') %>
+plot \
+<% @n.each_with_index do |n, ni| %><% tests.each_with_index do |t, i| %>'<%= File.join(data_dir, 'gc', n.to_s, t) %>' using 2:(\$3-\$4) title '<%= escape(t) + (@n.size == 1 ? '' : " #{n}" ) %>' with steps linestyle <%= i +1 %> dt <%= ni+1 %><%= tests.size == i+1 && @n.last == n  ? '' : ", \\\n" %><% end %><% end %>
 
 # , \\$alloc#{k} using 1:8 with impulses linestyle 7 title 'minor' axes x1y2, \\$alloc#{k} using 1:9 with impulses linestyle 8 title 'major' axes x1y2
 
@@ -73,4 +76,5 @@ set key on
 set yrange [0:*]
 set xrange [0:5]
 
-plot <%= tests.map.with_index { |k, i| "'#{File.join(data_dir, 'rss', k)}' using 2:3 title '#{escape(k)}' with steps linestyle #{i+1}" }.join(', ') %>
+plot \
+<% @n.each_with_index do |n, ni| %><% tests.each_with_index do |t, i| %>'<%= File.join(data_dir, 'rss', n.to_s, t) %>' using 2:3 title '<%= escape(t) + (@n.size == 1 ? '' : " #{n}" ) %>' with steps linestyle <%=  i +1 %> dt <%= ni+1 %><%= tests.size == i+1 && @n.last == n  ? '' : ", \\\n" %><% end %><% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: analyzer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips