rmatrix 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9829c8d78878d7413b7136080244726dd48a0499
-  data.tar.gz: 4ce19066f2407123a6bcdbce084d9c1701be6a6e
+  metadata.gz: 9fdaca317864fc78691e5a7326da776a3c35d18b
+  data.tar.gz: 7f1502ddf8c910b243f7447012223045c9632d41
 SHA512:
-  metadata.gz: 7f663caa0b96e5f80b16960adccd25d911be1e4b8e810fe68b5023a968e043a36da7041faec1b103639419610fb2a505438da6a87df6e3961dca6e2ffd12ddf0
-  data.tar.gz: 515388b00480af403af56f60b5ba38e3c0ab71fe257a84c47b33c220eaaee86d827f43e3bd5a037b427c2007c6e1cb680efdfa5abe808ac2b16b32604f2386e2
+  metadata.gz: 7302e71b8a4d550644cfa75e9b1afa90ed472ffa8f965aaeb50fe6088f695cb19d85aaa1b09cd911d740b303989b0a1351b6024b821f23a211798870f165c0a2
+  data.tar.gz: 52f4fb7f0f9a31174817253a380c327c77d9a94ba6fdf22aceb3e9b4590119f0ac88085ade5725a3169f41e01d9d032acadf4cf7157659130b41db09fdaee70c

data/lib/rmatrix/matrix.rb

@@ -130,12 +130,13 @@ module RMatrix
     end
 
     def mmap
+      return self.class.new(matrix, typecode) if shape.length == 0
       as_na = NArray.to_na(
         matrix.each.map do |elm|
           yield elm
         end
       ).to_type(typecode)
-      Matrix.new(as_na.reshape(*shape), typecode)
+      self.class.new(as_na.reshape(*shape), typecode)
     end
 
     def mask
@@ -225,9 +226,9 @@ module RMatrix
     def join(other)
       case true
       when self.rows == 1 && other.rows == 1
-        Vector.new(NArray.to_na([self.narray,other.narray]).to_type(self.typecode).reshape(self.columns + other.columns, 1))
+        self.class.new(NArray.to_na([self.narray,other.narray]).to_type(self.typecode).reshape(self.columns + other.columns, 1))
       when self.columns == 1 && other.columns == 1
-        Vector.new(NArray.to_na([self.narray,other.narray]).to_type(self.typecode).reshape(1, self.rows + other.rows))
+        self.class.new(NArray.to_na([self.narray,other.narray]).to_type(self.typecode).reshape(1, self.rows + other.rows))
       else
         raise "Couldn't join mismatched dimensions"
       end
@@ -303,12 +304,12 @@ module RMatrix
         raise "Matrix A columns(#{self.columns}) != Matrix B rows(#{other.columns})" if other.rows != self.columns
         Matrix.new(self.matrix * other.matrix, typecode)
       else
-        Matrix.new(apply_scalar(:*, other), typecode)
+        self.class.new(apply_scalar(:*, other), typecode)
       end
     end
 
     def mult(other)
-      Matrix.new(self.narray * other.narray, typecode)
+      self.class.new(self.narray * other.narray, typecode)
     end
 
     def ==(other)
@@ -432,8 +433,8 @@ TEX
     def self.gen_vec_or_matrix_delegator(name)
       define_method(name) do |*args, &blk|
         case self
-        when Matrix then Matrix.new(matrix.send(name, *args, &blk), typecode)
         when Vector then Vector.new(matrix.send(name, *args, &blk), typecode)
+        when Matrix then Matrix.new(matrix.send(name, *args, &blk), typecode)
         end
       end
     end
@@ -454,7 +455,7 @@ TEX
     end
 
     def to_type(type)
-      Matrix.new(narray.to_type(type), type)
+      self.class.new(narray.to_type(type), type)
     end
 
     def self.gen_delegator(name)
@@ -496,7 +497,7 @@ TEX
         else
           apply_scalar(op, other)
         end
-        Matrix.new(
+        self.class.new(
           result, typecode
         )
       end

data/lib/rmatrix/vector.rb

@@ -1,25 +1,22 @@
 module RMatrix
   class Vector < RMatrix::Matrix
 
-    def initialize(source, typecode=Typecode::FLOAT)
-      if narray
-        self.narray = narray
-        self.matrix = NMatrix.refer(matrix)
-      else
-        super
+    def initialize(source, typecode=Typecode::FLOAT, column_map: nil, row_map: nil)
+      super
+      unless (shape.length == 2 && [rows, columns].include?(1)) || shape.length == 0
+        raise "Invalid dimensions #{shape.join(?x).reverse}. Vector must be eiter Nx1 or 1xM"
       end
-      raise "Invalid dimensions #{shape.join(?x).reverse}. Vector must be eiter Nx1 or 1xM" unless [rows, columns].include?(1) && shape.length == 2
     end
 
-    def self.[](*inputs)
+    def self.[](*inputs, typecode: Typecode::FLOAT, row_map: nil, column_map: nil, column_label_map: nil, row_label_map: nil)
       if inputs.length == 1 && [String, Symbol].include?(inputs[0].class)
         if ['byte', 'sint', 'int', 'sfloat', 'float', 'scomplex', 'complex', 'object'].include?(inputs[0].to_s)
-          ->(*source){ Matrix.new(source, inputs[0].to_s) }
+          ->(*source){ V.new(source, inputs[0].to_s) }
         else
           Vector.new(inputs[0])
         end
       else
-        Vector.new(inputs)
+        Vector.new(inputs, typecode, row_map: nil, column_map: nil)
       end
     end
 

data/lib/rmatrix/version.rb

@@ -1,3 +1,3 @@
 module RMatrix
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmatrix
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Wouter Coppieters