rmatrix 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e94bbffce59e661eb2dbfc65f0daaa48302d41
-  data.tar.gz: a03be4886d3db4e977d07598b12ec85faad3bced
+  metadata.gz: 66edec4fe60372252f4542b6c2adf5e7ff88349e
+  data.tar.gz: 363d633958bce93fb9ae62de0aa8d12ba1c441bc
 SHA512:
-  metadata.gz: 2ea1f2a0d881e522a5d700517887d521405a0cfac196814b308374567e6212d8cb8304d50995cd95da168e7ae526a2bc2e70123a28f2237fc000dd0863313de3
-  data.tar.gz: dad148225008312cb74539bfbdd57567b1529ea88b2bdd47f805bec5714e51d0ee841ae0c25290ecf15dd3a751d6bfc60a905469ee4d2c51ccafc89abe3d7dac
+  metadata.gz: cadab96ed60b3bc2912abe69502ef76ed8739a15834fe32938188b1a011e1906b2e10334f7d79853761263f494e842390bf4a28af7e47cafa35392fc330d8c36
+  data.tar.gz: 7d6ba92b3df5794e9a315d788b994b454825d54745dd93c62c987a2547d1288976be17ab63ebb3a73b871da0ca4b5a1d22e2e52f04152c802a2728b11bb008c5

data/lib/rmatrix/core.rb

@@ -1,2 +1,3 @@
 require_relative "matrix"
 require_relative "vector"
+require_relative "print_table"

data/lib/rmatrix/indices.rb

@@ -1,17 +1,74 @@
 module RMatrix
   module Indices
+
+    def []=(*args, value)
+      indices = unmap_args(args)
+      raw[*indices] = value
+    end
+
     def [](*args)
       indices           = unmap_args(args)
       result_row_map    = build_result_map(self.row_map, indices.first, self.rows)      if self.row_map
       result_column_map = build_result_map(self.column_map, indices.last, self.columns) if self.column_map
-      raw[*indices, column_map: result_column_map, row_map: result_row_map]
+
+      row_indices, column_indices = indices
+
+      result_column_label_map = nil
+      result_row_label_map = nil
+
+      if row_label_map
+        case row_indices
+        when true then result_row_label_map = row_label_map
+        else
+          result_row_label_map = walk_indices(row_indices, row_label_map).each_slice(2).to_h
+        end
+      end
+
+      if column_label_map
+        case column_indices
+        when true then result_column_label_map = column_label_map
+        else
+          result_column_label_map = walk_indices(column_indices, column_label_map).each_slice(2).to_h
+        end
+      end
+
+      raw[*indices, column_map: result_column_map, column_label_map: result_column_label_map, row_map: result_row_map, row_label_map: result_row_label_map]
+    end
+
+    def method_missing(name, *args, &block)
+      if row_map && row_map.include?(name)
+        self[name, true]
+      elsif column_map && column_map.include?(name)
+        self[true, name]
+      else
+        super
+      end
+    end
+
+    def walk_indices(indices, parent, i={index: 0})
+      Array(indices).flat_map do |index|
+        res = case index
+        when Array, Range then walk_indices(index.to_a, parent, i)
+        else [i[:index], parent[index]]
+        end
+        i[:index] += 1
+        res
+      end
     end
 
     def raw
       @raw ||= begin
         raw = Struct.new(:narray, :typecode).new(self.narray, self.typecode)
-        def raw.[](*args, column_map: nil, row_map: nil)
-          args.all?{|x| Fixnum === x } ? narray[*args.reverse] : Matrix.new(narray[*args.reverse], typecode, column_map: column_map, row_map: row_map)
+        def raw.[](*args, column_map: nil, row_map: nil, row_label_map: nil, column_label_map: nil)
+          begin
+            args.all?{|x| Fixnum === x } ? narray[*args.reverse] : Matrix.new(narray[*args.reverse], typecode, column_map: column_map, row_map: row_map, row_label_map: row_label_map, column_label_map: column_label_map)
+          rescue StandardError => e
+            raise IndexError.new("Error accessing index at #{args}. Shape is #{narray.shape.reverse}")
+          end
+        end
+
+        def raw.[]=(*args, value)
+          narray[*args.reverse] = value
         end
         raw
       end
@@ -66,16 +123,19 @@ module RMatrix
     def unmap_args(args)
       if args.length == 1
         if row_map
-          return [unmap_index(self.row_map, args[0]), true] rescue nil
+          return [Array(unmap_index(self.row_map, args[0])), true] rescue nil
         end
         if column_map
-          return [true, [unmap_index(self.column_map, args[0])]] rescue nil
+          return [true, Array(unmap_index(self.column_map, args[0]))] rescue nil
         end
         return [args[0]]
       else
+        row_index    = self.row_map ? unmap_index(self.row_map, args[0]) : args[0]
+        column_index = self.column_map ? unmap_index(self.column_map, args[1]) : args[1]
+        column_index = [column_index] if column_index.kind_of?(Fixnum)
         [
-          self.row_map ? unmap_index(self.row_map, args[0]) : args[0],
-          Array(self.column_map ? unmap_index(self.column_map, args[1]) : args[1])
+          row_index,
+          column_index
         ]
       end
     end
@@ -98,7 +158,8 @@ module RMatrix
           first..last
         end
       else
-        index = map[columns]
+        index = (map[columns] rescue nil)
+        index = columns if !index && columns.kind_of?(Fixnum)
         raise "Value not present in index mapping: #{columns}" unless index
         index
       end

data/lib/rmatrix/matrix.rb

@@ -1,26 +1,51 @@
 module RMatrix
   class Matrix
+
+    class << self
+      attr_accessor :named_inspect
+    end
+
     require 'narray'
     require_relative 'typecode'
 
     include Enumerable
     include Indices
 
-    attr_accessor :invert_next_operation, :narray, :typecode, :row_map, :column_map
+    attr_accessor :invert_next_operation, :narray, :typecode, :row_map, :column_map, :row_label_map, :column_label_map
     attr_writer :matrix
 
-    def initialize(source, typecode=Typecode::FLOAT, column_map: nil, row_map: nil)
-      self.typecode = typecode
-      self.narray   = two_dimensional(source, typecode)
-      self.row_map, self.column_map = row_map, column_map
+    def initialize(source, typecode=Typecode::FLOAT, column_map: nil, row_map: nil, column_label_map: nil, row_label_map: nil)
+      self.typecode    = typecode
+      self.narray      = two_dimensional(source, typecode)
+      self.row_map     = row_map
+      self.column_map  = column_map
+    end
+
+    def row_map=(row_map)
+      @row_map = parse_map(row_map)
+      @row_label_map = @row_map.invert unless !@row_map || @row_map.default_proc
+    end
+
+    def column_map=(column_map)
+      @column_map = parse_map(column_map)
+      @column_label_map = @column_map.invert unless !@column_map || @column_map.default_proc
+    end
+
+    def parse_map(map, invert: false)
+      case map
+      when nil then map
+      when Array then invert ? map.each.with_index.map.to_h.invert : map.each.with_index.map.to_h
+      when Hash then map
+      else raise 'Invalid map type encountered'
+      end
     end
 
     def matrix
       @matrix ||= narray.empty? ? narray : NMatrix.refer(narray)
     end
 
-    def self.blank(rows: 1, columns: 1, typecode: Typecode::FLOAT, initial: 0)
-      source = self.new(NArray.new(typecode, columns, rows), typecode)
+    def self.blank(rows: 1, columns: 1, typecode: Typecode::FLOAT, initial: 0, column_map: nil, row_map: nil)
+      source = self.new(NArray.new(typecode, columns, rows), typecode, column_map: column_map, row_map: row_map)
       source.narray[]= initial unless source.empty?
       source
     end
@@ -30,7 +55,7 @@ module RMatrix
     end
 
     def _dump(level)
-       narray.to_s << ':' << columns.to_s << ':' << rows.to_s << ':' << narray.typecode.to_s
+      narray.to_s << ':' << columns.to_s << ':' << rows.to_s << ':' << narray.typecode.to_s
     end
 
     def self._load arg
@@ -280,28 +305,43 @@ module RMatrix
     end
 
     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
+      ("%-.#{p}e" % x).gsub(/0+e/,'e').gsub('.e+00','').gsub('e+00','')
     end
 
-    def inspect(sz=10, sig=6)
-      return 'M[Empty]' if empty?
-      return Vector::inspect_vector(self) if self.is_vector?
-      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  ")}"
+    def inspect(sz: 10, sig: 6, names: RMatrix::Matrix.named_inspect)
+      desc = case
+      when self.is_vector? then "Vector(#{self.length})"
+      else "Matrix(#{rows} x #{columns})"
+      end
+      "#{desc}\n#{RMatrix::MatrixTable.new(self).to_s}"
     end
 
     def to_tex(sz = 10, sig=6)
       values = condensed(sz, sig)
+      column_headers = column_label_map ? values[0].map.with_index do |v, i|
+        case v
+        when '\\cdots' then '\\cdots'
+        else (column_label_map && column_label_map[i]) || i
+        end
+      end : []
+
+      row_headers = row_label_map ? values.map.with_index do |v, i|
+        case v[0]
+        when '\\vdots' then '\\vdots'
+        else (row_label_map && row_label_map[i]) || i
+        end
+      end : []
+
       <<-TEX
-\\begin{pmatrix}
-#{values.map{|line| line.join(" & ")}.join(" \\\\ ")}
-\\end{pmatrix}
+$
+\\begin{array}{c} &
+\\begin{array}{c} #{column_headers.join(" & ")} \\end{array}\\\\
+\\begin{array}{c} #{row_headers.join(" \\\\ ")} \\end{array} &
+  \\left(\\begin{array}{ccc}
+    #{values.map{|line| line.join(" & ")}.join(" \\\\ ")}
+  \\end{array}\\right)
+\\end{array}
+$
 TEX
     end
 
@@ -333,21 +373,21 @@ TEX
       blank.narray.to_a.map{|line| (sig ? Array(line).map{|v| Numeric === v ? to_significant_figures(v,sig) : v } : Array(line))}
     end
 
-    def transpose
-      Matrix.new(self.matrix.transpose, typecode)
+    def transpose()
+      Matrix.new(self.matrix.transpose, typecode, column_map: self.row_map, row_map: self.column_map, column_label_map: self.row_label_map, row_label_map: self.column_label_map)
     end
 
-    def self.[](*inputs, typecode: Typecode::FLOAT, row_map: nil, column_map: nil)
+    def self.[](*inputs, typecode: Typecode::FLOAT, row_map: nil, column_map: nil, column_label_map: nil, row_label_map: nil)
       if inputs.length == 1 && Matrix === inputs[0]
         inputs[0]
       elsif inputs.length == 1 && [String, Symbol].include?(inputs[0].class)
         if ['byte', 'sint', 'int', 'sfloat', 'float', 'scomplex', 'complex', 'object'].include?(inputs[0])
-          ->(*source){ Matrix.new(source, inputs[0], row_map: row_map, column_map: column_map)}
+          ->(*source){ Matrix.new(source, inputs[0], row_map: row_map, column_map: column_map, row_label_map: row_label_map, column_label_map: column_label_map)}
         else
-          Matrix.new(inputs[0], typecode, row_map: row_map, column_map: column_map)
+          Matrix.new(inputs[0], typecode, row_map: row_map, column_map: column_map, row_label_map: row_label_map, column_label_map: column_label_map)
         end
       else
-        Matrix.new(inputs, typecode, row_map: row_map, column_map: column_map)
+        Matrix.new(inputs, typecode, row_map: row_map, column_map: column_map, row_label_map: row_label_map, column_label_map: column_label_map)
       end
     end
 
@@ -475,4 +515,5 @@ TEX
   end
 
   class ::NArray; include Enumerable; end
-end
+end
+RMatrix::Matrix.named_inspect = true

data/lib/rmatrix/matrix_table.rb

@@ -0,0 +1,83 @@
+module RMatrix
+  class MatrixTable < PrintTable
+    def initialize(matrix, max_columns: 10, max_rows: 10)
+      super()
+      column_offset, row_offset = 0, 0
+      column_labels = !!matrix.column_label_map
+      row_labels    = !!matrix.row_label_map
+
+      printed_rows = [matrix.rows, max_rows].min
+      printed_columns = [matrix.columns, max_columns].min
+
+      if matrix.column_label_map
+        printed_columns.times do |i|
+          column_label = matrix.column_label_map[i]
+          if column_label
+            self[i+1 + (row_labels ? 1 : 0 ), 0] = column_label.inspect
+          end
+        end
+        row_offset += 1
+      end
+
+      if matrix.row_label_map
+        printed_rows.times do |i|
+          row_label = matrix.row_label_map[i]
+          if row_label
+            self[0, i + (column_labels ?  1 : 0)] = row_label.inspect
+          end
+        end
+        column_offset += 1
+      end
+
+
+      self[column_offset,row_offset] = "#{matrix.is_vector? ? 'V' : 'M'}["
+      column_offset += 1
+      matrix.each_row.with_index do |row, row_idx|
+        break if row_idx > printed_rows
+        row.each.with_index do |cell, column_idx|
+          break if column_idx > printed_columns
+          self[column_idx + column_offset, row_idx + row_offset] = cell
+        end
+        self[[matrix.columns + column_offset, printed_columns + column_offset + 1].min, row_idx + row_offset] = ',' if (row_idx + row_offset - 1) != printed_rows
+      end
+
+      column_overlap = matrix.columns > max_columns
+      row_overlap    = matrix.rows    > max_rows
+      both_overlap   = column_overlap && row_overlap
+
+      if column_overlap
+        printed_rows.times do |row|
+          self[max_columns + column_offset - 1, row + row_offset] = '…'
+          self[max_columns + column_offset, row + row_offset] = matrix[row, -1].first
+        end
+      end
+
+      if row_overlap
+        printed_columns.times do |column|
+          self[column + column_offset, max_rows + row_offset - 1] = '⋮'
+          self[column + column_offset, max_rows + row_offset] = matrix[column, -1].first
+        end
+      end
+
+      if both_overlap
+        self[printed_columns + column_offset - 1, printed_rows + row_offset - 1] = "⋱"
+        self[printed_columns + column_offset - 1, printed_rows + row_offset] = '⋮'
+        self[printed_columns + column_offset, printed_rows + row_offset - 1] = '…'
+      end
+
+      self[self.column_count - 1, self.row_count - 1] = ']'
+
+      if row_labels
+        self.set_column_separator( 0, ' ')
+        self.set_column_separator( 1, '[')
+        self.set_column_separator(self.column_count - 1, ']')
+      else
+        self.set_column_separator( 0, '[')
+        self.set_column_separator(self.column_count - 2, ']')
+      end
+
+      self.set_column_separator(self.column_count - 2, ']')
+    end
+  end
+
+end

data/lib/rmatrix/print_table.rb

@@ -0,0 +1,107 @@
+module RMatrix
+  class PrintTable
+    attr_accessor :row_count, :column_count, :cells, :column_justifications, :separators
+    def initialize
+      self.row_count = self.column_count = 0
+      self.cells = {}
+      self.column_justifications = {}
+      self.separators = Hash.new(', ')
+    end
+
+    def to_s
+      widths = self.column_widths
+      self.row_count.times.map do |row|
+        self.column_count.times.flat_map do |column|
+          cell_text = cell_repr(self.cells[[column, row]])
+          justification = column_justification(column)
+          width = widths[column]
+          contents = case justification
+          when :left  then cell_text.ljust(width)
+          when :right then cell_text.rjust(width)
+          end
+          [contents,self.separators[[column, row]]]
+        end[0...-1].join
+      end.join("\n")
+    end
+
+    def to_tex
+      tex_map = self.row_count.times.map do |row|
+        self.column_count.times.map do |column|
+          cell_repr(self.cells[[column, row]])
+        end
+      end
+      <<-TEX
+\\[
+  \\text{Mat}_{\\varphi\\text{ to }M} = \\kbordermatrix{
+    & c_1 & c_2 & c_3 & c_4 & c_5 \\\\
+    r_1 & 1 & 1 & 1 & 1 & 1 \\\\
+    r_2 & 0 & 1 & 0 & 0 & 1 \\\\
+    r_3 & 0 & 0 & 1 & 0 & 1 \\\\
+    r_4 & 0 & 0 & 0 & 1 & 1 \\\\
+    r_5 & 0 & 0 & 0 & 0 & 1
+  }
+\\]
+TEX
+    end
+
+    def column_justification(i)
+      case self.column_justifications[i]
+      when nil then :right
+      when :right then :right
+      when :left then :left
+      else raise "Unexpected justification for column #{self.column_justifications[i] }"
+      end
+    end
+
+    def set_column_separator(column, separator)
+      self.row_count.times do |row|
+        self.separators[[column, row]] =  separator
+      end
+    end
+
+    def column_widths
+      column_count.times.map do |i|
+        column_width(i)
+      end
+    end
+
+    def column_width(column)
+      self.row_count.times.reduce(0) do |agg, row|
+        [agg, self.cell_repr(self.cells[[column, row]]).length].max
+      end
+    end
+
+    def cell_repr(cell)
+      case cell
+      when nil then ''
+      when Numeric then numeric_to_truncated_string(cell)
+      else "#{cell}"
+      end
+    end
+
+    def numeric_to_truncated_string(numeric)
+      ("%-.4e" % numeric).gsub(/(?<!\.)0+e/,'e').gsub('.e+00','').gsub('e+00','')
+    end
+
+    def [](column, row)
+      self.cells[[column, row]]
+    end
+
+    def []=(column, row, value)
+      build_column!(column)
+      build_row!(row)
+      self.cells[[column, row]] = value
+    end
+
+    def build_column!(idx)
+      self.column_count = [self.column_count || 0, idx.succ].max
+    end
+
+    def build_row!(idx)
+      self.row_count = [self.row_count || 0 , idx.succ].max
+    end
+  end
+
+
+end
+require_relative 'matrix_table'

data/lib/rmatrix/version.rb

@@ -1,3 +1,3 @@
 module RMatrix
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/rmatrix.todo

@@ -1,6 +1,10 @@
+ ☐ Refactor + tidy
+ Tests:
+  ☐ Indexing
+  ☐ Assignment
+ ✔ Add matrix assignment @done (17-02-28 08:32)
  ✘ Use Numo::NArray (Not ready yet) @cancelled (16-09-29 08:23)
- ☐ Add matrix assignment
- ☐ Add random int matrix
+ ✘ Add random int matrix @cancelled (17-02-27 09:19)
  ✔ Implement to_tex for notebooks @done (16-09-29 08:23)
  ✔ Update print @done (16-04-06 07:40)
  ✔ Basic matrix functions and tests @done (16-04-06 07:40)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmatrix
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,6 +158,8 @@ files:
 - lib/rmatrix/core.rb
 - lib/rmatrix/indices.rb
 - lib/rmatrix/matrix.rb
+- lib/rmatrix/matrix_table.rb
+- lib/rmatrix/print_table.rb
 - lib/rmatrix/shortcuts.rb
 - lib/rmatrix/typecode.rb
 - lib/rmatrix/vector.rb