rmatrix 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ef041f60282c09c58765f159e598b55a3cc7cd4
-  data.tar.gz: 624800e2934fe3858adfbbd62e6455574bce512b
+  metadata.gz: 8d9e08234443fb6561f27415e8983fb38c891caa
+  data.tar.gz: 7acf0c970c1f76f00d994d4c63dfd4274c7adb71
 SHA512:
-  metadata.gz: 1e8bf852ff5b4c8cad5e541b68604784a401ab140c01654f8bd442b4899c5b047de3d55dca050ab0e8452488f2fe56bd22cb0f40f7afa6620eb7277975ffffd2
-  data.tar.gz: 35fd9c5279d0b45c7a651c11ea06c9b42f26035697e0093a1b6cc32f95bb6dbb2a3b79ce6fd1f111d1fe0e0c6d3b0c5b316abba785500f298a8b42effdc030a4
+  metadata.gz: 0d670a1746cac7d99e41ba6cd2ff670d1b9cf77542db9fa0b1169316e06aeb8dd0fee263838a9a3647c861084ca8e967f4a493e25fce47f9f4f34eff2502b589
+  data.tar.gz: 27dadc6876785f9a01bc31445b75674d73454311fec1d32fa2dbaf564b14810f4b6023a976476402b3831554c602fe627ca0b6d854b7df53fc08353b2cdd57ef

data/lib/rmatrix/matrix.rb

@@ -20,16 +20,34 @@ module RMatrix
     end
 
     def self.blank(rows: 1, columns: 1, typecode: Typecode::SFLOAT, initial: 0)
-      self.new(NArray.new(typecode, columns, rows), typecode) + initial
+      source = self.new(NArray.new(typecode, columns, rows), typecode)
+      source.narray[]= initial unless source.empty?
+      source
+    end
+
+    def set_all(value)
+      narray[]=(value)
     end
 
     def _dump(level)
-      [narray.typecode, columns, rows, narray.to_s].join(":")
+       narray.to_s << ':' << columns.to_s << ':' << rows.to_s << ':' << narray.typecode.to_s
     end
 
     def self._load arg
-      typecode, columns, rows, as_str = arg.split(":",4)
-      Matrix.new(NArray.to_na(as_str.to_s, typecode.to_i).reshape(columns.to_i, rows.to_i), typecode.to_i)
+      split_index, buffer, index = 0, '', arg.length - 1
+      split = Array.new(3)
+      while split_index < 3
+        case char = arg[index]
+        when ':'
+          split[split_index] = buffer.reverse.to_i
+          split_index += 1
+          buffer = ''
+        else buffer << char
+        end
+        index -= 1
+      end
+      arg[index+1..-1] = ''
+      self.new(NArray.to_na(arg, split[0]).reshape(split[2], split[1]), split[0])
     end
 
     def each(&block)
@@ -257,21 +275,58 @@ module RMatrix
       [rows, columns].include?(1)
     end
 
-    def inspect
+    def to_significant_figures(x, p)
+      x.zero? ? 0 : begin
+        nm = Math.log(x, 10.0).floor + 1.0 - p
+        (((10.0 ** -nm) * x).round * (10.0 ** nm)).round(nm.abs)
+      end
+    end
+
+    def inspect(sz=10, sig=6)
       return 'M[Empty]' if empty?
       return Vector::inspect_vector(self) if self.is_vector?
-      inspect_rows    = [10, self.rows].min
-      inspect_columns = [10, self.columns].min
-      more_rows       = inspect_rows    < self.rows
-      more_columns    = inspect_columns < self.columns
+      values = condensed(10, sig, '⋮', '…', "⋱")
+      max_width = 0
+      values = values.map{|line| line.map{|val| as_str = val.to_s; max_width = [as_str.length, max_width].max; as_str}}
+      values = values.map{|line| line.map{|val| val.rjust(max_width, ' ') }}
+      "#{rows} x #{columns} Matrix\nM[#{values.map{|row| "[#{row.join(", ")}]" }.join(",\n  ")}"
+    end
 
-      to_print        = self.matrix[0...inspect_columns, 0...inspect_rows]
-      as_strings = inspect_columns.times.map do |i|
-        column    = to_print[i, 0...inspect_rows].flatten.to_a.map{|f| f.to_s.gsub(/(\.\d{4}).*/, "\\1") }
-        max_width = column.map{|s| s.length }.max
-        column.map!{|s| s.rjust(max_width, ' ')} + (more_rows ? ['.' * max_width] : [])
-      end.transpose
-      "#{rows} x #{columns} Matrix\nM#{box_lines(as_strings.map{|row| row.join(", ") }, more_columns)}"
+    def to_tex(sz = 10, sig=6)
+      values = condensed(sz, sig)
+      <<-TEX
+\\begin{pmatrix}
+#{values.map{|line| line.join(" & ")}.join(" \\\\ ")}
+\\end{pmatrix}
+TEX
+    end
+
+    def condensed(sz=10, sig=6, vdots='\\vdots', cdots='\\cdots', ddots='\\ddots')
+      width  = [sz, self.cols].min
+      height = [sz, self.rows].min
+      insert_cdots = self.cols > sz
+      insert_vdots = self.rows > sz
+
+      width  += 1 if insert_cdots
+      height += 1 if insert_vdots
+
+      blank = M.blank(rows: height, columns: width, typecode: Typecode::OBJECT)
+      blank.narray[0...width, 0...height] = self.narray[0...width, 0...height]
+
+      blank.narray[0...width, -1] = self.narray[0...width, -1]
+      blank.narray[-1,0...height] = self.narray[-1, 0...height]
+
+      blank.narray[0...width, -2] = vdots if insert_vdots
+      blank.narray[-2, 0...height] = cdots if insert_cdots
+
+      if insert_cdots && insert_vdots
+        blank.narray[-2, -2] = ddots
+        blank.narray[-1, -2] = vdots
+        blank.narray[-2, -1] = cdots
+        blank.narray[-1, -1] = self.narray[-1, -1]
+      end
+
+      blank.narray.to_a.map{|line| (sig ? Array(line).map{|v| Numeric === v ? to_significant_figures(v,sig) : v } : Array(line))}
     end
 
     def transpose
@@ -318,6 +373,10 @@ module RMatrix
       end
     end
 
+    def to_type(type)
+      Matrix.new(narray.to_type(type), type)
+    end
+
     def self.gen_delegator(name)
       define_method(name) do |*args, &blk|
         result = matrix.send(name, *args, &blk)

data/lib/rmatrix/version.rb

@@ -1,3 +1,3 @@
-module Rmatrix
-  VERSION = "0.1.7"
+module RMatrix
+  VERSION = "0.1.8"
 end

data/rmatrix.gemspec

@@ -5,7 +5,7 @@ require 'rmatrix/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "rmatrix"
-  spec.version       = Rmatrix::VERSION
+  spec.version       = RMatrix::VERSION
   spec.authors       = ["Wouter Coppieters"]
   spec.email         = ["wouter.coppieters@youdo.co.nz"]
 
@@ -34,6 +34,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "rbczmq"
+  spec.add_development_dependency "iruby"
   spec.add_runtime_dependency "narray"
   spec.add_runtime_dependency "opencl_ruby_ffi"
 end

data/rmatrix.todo

@@ -1,9 +1,11 @@
+ ☐ Use Numo::NArray (Not ready yet)
+ ☐ Implement to_tex for notebooks
  ✔ Update print @done (16-04-06 07:40)
  ✔ Basic matrix functions and tests @done (16-04-06 07:40)
- ☐ Enumeration, each over columns, each over rows, each element, each reverse, each column/row reversed
- ☐ Map to Matrix
- ☐ Select rows
- ☐ Select columns
- ☐ Slice/Mask rows and columns
- ☐ Specs
- ☐ Float, Double, Complex, Double Complex and integer types
+ ✔ Enumeration, each over columns, each over rows, each element, each reverse, each column/row reversed @done (16-09-26 10:13)
+ ✔ Map to Matrix @done (16-09-26 10:13)
+ ✔ Select rows @done (16-09-26 10:13)
+ ✔ Select columns @done (16-09-26 10:13)
+ ✔ Slice/Mask rows and columns @done (16-09-26 10:13)
+ ✔ Specs @done (16-09-26 10:13)
+ ✔ Float, Double, Complex, Double Complex and integer types @done (16-09-26 10:13)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmatrix
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rbczmq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: iruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: narray
   requirement: !ruby/object:Gem::Requirement