rmatrix 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b03156a99a7338c06f4bde90d9c21af4323e3a75
-  data.tar.gz: 9c3229920bcb608b8cec92320e2f5c4119d93966
+  metadata.gz: e702174b89d1c6001ed7d073f07596c523971e80
+  data.tar.gz: 5cde45903463d02075f5980d897770ce302436a4
 SHA512:
-  metadata.gz: 2f3d4b98cdb9cb7fde56f80fa4988c9bbf88387c136dd0487ee0192e533d61c0a06a5ed070f6dbdbcc48fa932cf73ab9b216219123e7802ad82a0bce8c6343db
-  data.tar.gz: 8e19dfaf471c07dbaf8463ab646bb5c9c1f440f2d20ad2f71e8ab4b519f3488d0c2fea61031f7c5f296fff713fb433d82b8d492aafed85d1c453869b881c3bd9
+  metadata.gz: 8526932acbe01d0ffc6fc6b0ed58d0a10de481307c956cb1179cfd72b51e937603f7ada7e13dd1fcf1eb5ca7c6ee19b4392bbc6d5b573b8f655d2558a5d63c87
+  data.tar.gz: dc8dcd3d0467a29f5deb7dcc0c9a99485454133cba2c206eebd473b2cae8b1f61098abe17424fdbcb5e44a5cb1e930d37c900d673e130680316bcccd2d7b18eb

data/lib/rmatrix/matrix.rb

@@ -58,9 +58,19 @@ module RMatrix
       narray.to_s << ':' << columns.to_s << ':' << rows.to_s << ':' << narray.typecode.to_s
     end
 
+    def map(flatten: true)
+      narray.to_type(RMatrix::Matrix::Typecode::OBJECT).map do |x|
+        yield x
+      end.to_a
+    end
+
+    def flat_map(&block)
+      map(&block).flatten(1)
+    end
+
     def to_f
       if length === 1
-        self[0].to_f
+        self.narray[0].to_f
       else
         raise "Can only call to_f on vectors of length 1"
       end
@@ -68,11 +78,12 @@ module RMatrix
 
     def to_i
       if length === 1
-        self[0].to_i
+        self.narray[0].to_i
       else
         raise "Can only call to_i on vectors of length 1"
       end
     end
+
     def self._load arg
       split_index, buffer, index = 0, '', arg.length - 1
       split = Array.new(3)

data/lib/rmatrix/plot.rb

@@ -0,0 +1,84 @@
+class RMatrix::Matrix
+  def gplot(type: 'lines', series_names: [], xrange: nil, yrange: nil, title: '', ylabel: '', xlabel: '', style: nil)
+    require 'gnuplot'
+    require 'base64'
+    output_file = Tempfile.new(['plt','.png']).path
+    plot = nil
+    Gnuplot.open do |gp|
+      plot = Gnuplot::Plot.new( gp ) do |plot|
+
+        plot.xrange "[#{xrange.begin}:#{xrange.end}]" if xrange
+        plot.title  title
+        plot.ylabel ylabel
+        plot.xlabel xlabel
+        plot.set("style", style) if style
+        plot.terminal 'png size 1000,1000'
+
+        x = (0..50).collect { |v| v.to_f }
+        y = x.collect { |v| v ** 2 }
+
+        plot.output(output_file)
+
+        plot.data = self.each_row.map.with_index do |row, i|
+          Gnuplot::DataSet.new(row.to_a) do |ds|
+            ds.with = type
+            ds.title = series_names[i] || ''
+            yield ds if block_given?
+          end
+        end
+      end
+    end
+
+    puts "\033]1337;File=inline=1:#{Base64.encode64(IO.read(output_file))}\a";
+  end
+
+  def gruff(title: '', type: 'Line', labels:{}, series_names: [], hide_legend: false, theme: Gruff::Themes::RAILS_KEYNOTE)
+    require 'gruff'
+    g = Gruff.const_get(type).new
+    # g.theme = {
+    #   :colors => ["#3366CC","#DC3912","#FF9900","#109618","#990099","#3B3EAC","#0099C6","#DD4477","#66AA00","#B82E2E","#316395","#994499","#22AA99","#AAAA11","#6633CC","#E67300","#8B0707","#329262","#5574A6","#3B3EAC"],
+    #   :marker_color => '#dddddd',
+    #   :font_color => 'black',
+    #   :background_colors => ['white', '#acacac']
+    #   # :background_image => File.expand_path(File.dirname(__FILE__) + "/../assets/backgrounds/43things.png")
+    # }
+    # g.hide_legend = true if hide_legend || series_names.empty? && self.rows.to_i > 10
+    # g.title = title
+    # g.labels = {}
+    self.each_row.map.with_index do |row, i|
+      series_name = (series_names[i] || i).to_s
+      g.data series_name, row.to_a[0..5].map{|v| v.round(2)}
+    end if self.rows
+    fname = "/tmp/chrt-#{Random.rand(1000000...9999999)}.png"
+    g.write(fname)
+    puts "\033]1337;File=inline=1:#{Base64.encode64(g.to_blob)}\a";
+  end
+
+  def threed_gplot(pm3d: false)
+    require 'gnuplot'
+    output_file = Tempfile.new(['plt','.png']).path
+    plot = nil
+    Gnuplot.open do |gp|
+      plot = Gnuplot::SPlot.new( gp ) do |plot|
+
+        case IRuby::Kernel.instance
+        when nil
+          puts "Setting output"
+          plot.terminal 'png'
+          plot.output(output_file)
+        end
+        # see sin_wave.rb
+        plot.pm3d if pm3d
+        plot.hidden3d
+
+        plot.data << Gnuplot::DataSet.new( self.to_a ) do |ds|
+          ds.with = 'lines'
+          ds.matrix = true
+        end
+
+      end
+    end
+
+    puts "\033]1337;File=inline=1:#{Base64.encode64(IO.read(output_file))}\a";
+  end
+end

data/lib/rmatrix/random.rb

@@ -0,0 +1,35 @@
+module RMatrix
+  module Random
+    module ClassMethods
+      def normal
+      end
+
+      def uniform(n=10,low: 0.0,high: 1.0)
+        M.blank(columns: n).generate do
+          ::Random.rand(low..high.to_f)
+        end
+      end
+
+      def normal(n=10,low: 0.0,high: 1.0)
+        spread = high - low
+        M.blank(columns: n, rows: 6).random!.*(spread).+(low).avg(1)
+      end
+
+      def binomial
+      end
+    end
+
+    def generate(n=50, initial=nil)
+      length.times do |i|
+        self[i] = block_given? ?
+          yield(i.zero? ? initial : self[i - 1], i, ->(idx){self[idx]}) :
+          ::Random.rand(0..10)
+      end
+      self
+    end
+
+    def self.included(base)
+      base.extend ClassMethods
+    end
+  end
+end

data/lib/rmatrix/version.rb

@@ -1,3 +1,3 @@
 module RMatrix
-  VERSION = "0.1.11"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmatrix
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,8 +159,10 @@ files:
 - lib/rmatrix/core.rb
 - lib/rmatrix/indices.rb
 - lib/rmatrix/matrix.rb
+- lib/rmatrix/plot.rb
 - lib/rmatrix/printing/matrix_table.rb
 - lib/rmatrix/printing/print_table.rb
+- lib/rmatrix/random.rb
 - lib/rmatrix/shortcuts.rb
 - lib/rmatrix/typecode.rb
 - lib/rmatrix/vector.rb