ruby-mext 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e17fe59684741fe17bcb1115faf090621239cdc7afb3823a3601ae7b8e643449
-  data.tar.gz: 670b6028c1a79e8feaac202c9ddb3da4f07f5d72e93a3a5d862e3a9f9ce58e7a
+  metadata.gz: '03508612b0d517d9d7e3928a1cee1cfecbeb65a3482351e7c40446de27b1b9de'
+  data.tar.gz: 96439ab70941ef071c43540cb5502421d06f12314d71c51ea5671c0f39ba5b70
 SHA512:
-  metadata.gz: a09e8d92256aadcd2bbfe12fa3ec7caffb4c33c2213f7e1e5843a810cef484c580b39db9c064f0da2a83c562c63e0b51d06e1a391343903777f5bc23192baa6e
-  data.tar.gz: 7e5414a0aa5f5790286825e2acf7c800e3a43b8d315b29df1a35bb8f7d97c8587909dba9d62f256d8431ad63935aa9313c14d488f9ac66bb6581521481245c9e
+  metadata.gz: c0d5720ecb32f75b9c64437695596f063691a6bf17c459e7fc1ee8b1cc2943a0cac6b74ef4663a02c47aa71a740ab3f85e6eeefd326139e2409154681fdffe29
+  data.tar.gz: 6468d791f4d178b41214599b13542a7ee94cd0141f83db12d581f9bc727b522fe2b3c6d54db63366df8728e700fc70882b85fea40024a51cf7f879f618a890e7

data/lib/mext/math/expon.rb

@@ -47,6 +47,10 @@ module Math
       (CMath::exp(self.a*x + self.b) + self.c).abs   # we want a real number result, no complex please
     end
 
+    def label
+      "tau: #{self.tau}"
+    end
+
   private
 
     def setup

data/lib/mext/math/function.rb

@@ -45,6 +45,16 @@ module Math
       [resx, resy]
     end
 
+    #:doc:
+    #
+    # +label+
+    #
+    # Returns a label which can be used in plots
+    #
+    def label
+      ''
+    end
+
   private
 
     def setup

data/lib/mext/math/line.rb

@@ -38,6 +38,10 @@ module Math
       (self.a*x) + self.b
     end
 
+    def label
+      "a: #{self.a}\nb: #{self.b}"
+    end
+
   private
 
     def setup

data/lib/tasks/gruff/expon.rake

@@ -4,17 +4,15 @@ require File.expand_path(File.join('..', 'gruff_plot'), __FILE__)
 
 namespace :plot do
 
-  task :create_output_dir do
-    unless Dir.exists?(Mext::Gruff::Plotter::OUTPUT_PATH)
-      mkdir_p Mext::Gruff::Plotter::OUTPUT_PATH
-    end
-  end
-
   desc 'plot the Expon dataset'
   task :expon => :create_output_dir do
     ranges = [ Range.new(0, 2), Range.new(3,3) ]
     p = Mext::Gruff::Plotter.new('expon_dataset', 800, Mext::Spec::Fixtures::Math::EXPON_DATASETS, ranges)
-    p.plot
+    p.plot do
+      |args|
+      (ys, ye, xs, xe, tau, xmid, ymid) = args
+      Math::Expon.new(ys, ye, xs, xe, tau)
+    end
   end
 
 end

data/lib/tasks/gruff/gruff.rake

@@ -1,3 +1,13 @@
 
 desc 'plot all plots'
-task :plot => ['plot:expon']
+task :plot => ['plot:expon', 'plot:line']
+
+namespace :plot do
+
+  task :create_output_dir do
+    unless Dir.exists?(Mext::Gruff::Plotter::OUTPUT_PATH)
+      mkdir_p Mext::Gruff::Plotter::OUTPUT_PATH
+    end
+  end
+
+end

data/lib/tasks/gruff/gruff_plot.rb

@@ -1,18 +1,24 @@
 require 'gruff'
+require 'byebug'
 
 module Mext
   module Gruff
 
     class Plotter
       attr_reader :title, :size, :datasets, :ranges
+      attr_accessor :step, :dot_radius
 
       OUTPUT_PATH = File.expand_path(File.join(['..'] * 4, 'tmp', 'output'), __FILE__)
+      DEFAULT_STEP = 0.1
+      DEFAULT_DOT_RADIUS = 2.0
 
-      def initialize(t, s, ds, r = nil)
+      def initialize(t, s, ds, r = nil, stp = DEFAULT_STEP)
         @title = t
         @size = s
         @datasets = ds
         @ranges = r
+        self.step = stp
+        self.dot_radius = DEFAULT_DOT_RADIUS
       end
 
       def plot
@@ -22,12 +28,13 @@ module Mext
           |range|
           g = ::Gruff::Line.new(self.size)
           g.title = self.title + " (#{idx})"
+          g.theme = ::Gruff::Themes::PASTEL
+          g.dot_radius = self.dot_radius
           self.datasets[range].each do
             |args|
-            (ys, ye, xs, xe, tau, xmid, ymid) = args
-            f = Math::Expon.new(ys, ye, xs, xe, tau)
-            (xdata, ydata) = f.xy(0.1)
-            g.dataxy("tau: #{f.tau}", xdata, ydata)
+            f = yield(args)
+            (xdata, ydata) = f.xy(self.step)
+            g.dataxy(f.label, xdata, ydata)
           end
           g.write(File.join(Mext::Gruff::Plotter::OUTPUT_PATH, self.title.gsub(/\s+/, '_') + "_#{idx}.png"))
           idx += 1
@@ -35,5 +42,6 @@ module Mext
       end
 
     end
+
   end
 end

data/lib/tasks/gruff/line.rake

@@ -0,0 +1,18 @@
+require 'fileutils'
+require File.expand_path(File.join(['..'] * 4, 'spec', 'fixtures', 'line_dataset'), __FILE__)
+require File.expand_path(File.join('..', 'gruff_plot'), __FILE__)
+
+namespace :plot do
+
+  desc 'plot the Line dataset'
+  task :line => :create_output_dir do
+    ranges = [ Range.new(0, 0), Range.new(1,1) ]
+    p = Mext::Gruff::Plotter.new('line_dataset', 800, Mext::Spec::Fixtures::Math::LINE_DATASETS, ranges)
+    p.plot do
+      |args|
+      (ys, ye, xs, xe, xmid, ymid) = args
+      Math::Line.new(ys, ye, xs, xe)
+    end
+  end
+
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Mext
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mext
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nicola Bernardini
@@ -137,6 +137,7 @@ files:
 - lib/tasks/gruff/expon.rake
 - lib/tasks/gruff/gruff.rake
 - lib/tasks/gruff/gruff_plot.rb
+- lib/tasks/gruff/line.rake
 - lib/version.rb
 - ruby-mext.gemspec
 homepage: https://github.com/nicb/ruby-mext