graph-function 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8156ac336aa21fcec58bb48b1a126a56858ef0a
-  data.tar.gz: d3cac5ba48aa74d4454e93c0155713543052a33a
+  metadata.gz: db0cb7f4f328670b3e50c017aee8e7cb2e751b5e
+  data.tar.gz: 4dc1a476b53979628653cfc4ca8b58e2877a334c
 SHA512:
-  metadata.gz: b3eee5a95f3524c98b31e2e563ab2d59ce3c525ce7a2ca95e0d21a0cecc42259122bd2b23be6365c741f6534a636d6722b9bb716db56b66d5e7c3258d518bdfe
-  data.tar.gz: 8dd2d7be6cbbdaf401772dbbe293aa78a97952bf63da5ef69b1a382ded1f232a4d4e0b5143123b8adfcff1d68eec602c58eb327788be73ab5299586ba9ff0133
+  metadata.gz: a65c9b5017291a906b829a48e52f3026394c10d92291169316ab661a5e8cedf0c4318f15534037995c853aed191f9733fb259043c722db7e615f76205e7e69a3
+  data.tar.gz: 2494046e069fc639949a25d9ad3677ce5f8f81bac798229fe13423a6a71b5f58c55691ba8324490e50c17219d9585513055d31cfd13f8a0cc48cebaf92dcd1da

data/graph-function.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rantly'
   spec.add_dependency 'faker'
   spec.add_dependency 'ruby-progressbar'
-  spec.add_dependency 'benchmark-memory'
+  spec.add_dependency 'memory_profiler'
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/graph/function.rb

@@ -1,5 +1,6 @@
 require 'gnuplot'
 require 'benchmark'
+require 'memory_profiler'
 require 'rantly'
 require 'faker'
 require 'ruby-progressbar'
@@ -45,7 +46,7 @@ module Graph
     class Configuration
       attr_accessor :terminal, :output
       attr_accessor :step
-      attr_accessor :trials
+      attr_accessor :trials, :memory
 
       # defaults
       # see https://github.com/rdp/ruby_gnuplot/blob/master/examples/output_image_file.rb
@@ -54,7 +55,9 @@ module Graph
         @terminal = 'x11'
         @output = '.'
         @step = (0..10_000).step(1000).to_a
+        # these are particular to GF, not Gnuplot
         @trials = 1
+        @memory = false
       end
     end
   end

data/lib/graph/function/comparison.rb

@@ -34,7 +34,11 @@ module Graph
                 pb.increment
                 data = data_generator.call(v)
                 current_trials = (1..trials).collect do |_|
-                  Benchmark.measure { f.call(data) }.real
+                  if Graph::Function.configuration.memory
+                    MemoryProfiler.report { f.call(data) }.total_allocated_memsize
+                  else
+                    Benchmark.measure { f.call(data) }.real
+                  end
                 end
                 results[name][v] = current_trials
                 current_trials.reduce(0.0, :+) / trials

data/lib/graph/function/plot_config.rb

@@ -2,11 +2,20 @@ module Graph
   module Function
     module PlotConfig
       def set_up(plot)
-        plot.ylabel (Graph::Function.configuration.trials == 1 ? 'execution time (seconds)' : 'average execution time (seconds)')
+        plot.ylabel ylabel
         plot.xlabel 'input size'
         plot.terminal (t = Graph::Function.configuration.terminal)
         plot.output Graph::Function.configuration.output unless t == 'x11'
       end
+
+      private
+      def ylabel
+        if Graph::Function.configuration.memory
+          Graph::Function.configuration.trials == 1 ? 'total allocation memsize (bytes)' : 'average total allocation memsize (bytes)'
+        else
+          Graph::Function.configuration.trials == 1 ? 'execution time (seconds)' : 'average execution time (seconds)'
+        end
+      end
     end
   end
 end

data/lib/graph/function/version.rb

@@ -1,5 +1,5 @@
 module Graph
   module Function
-    VERSION = '0.1.7'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graph-function
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Moore-Niemi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gnuplot
@@ -68,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: benchmark-memory
+  name: memory_profiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="