rmatrix 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 086a2b50321d23257cc4370fe65f3f1ebff27ce0
-  data.tar.gz: 4c3c8e4c5e02e0992bcf4b0f7f2609b436757c17
+  metadata.gz: 9829c8d78878d7413b7136080244726dd48a0499
+  data.tar.gz: 4ce19066f2407123a6bcdbce084d9c1701be6a6e
 SHA512:
-  metadata.gz: beb67f3e7e779d2b3b3f0236a981510fdd83dd53c5deaf25b3903c0ed5205bcaec6b297aca3524c26285633b576e9fe0c582ea850b0c9abdbe3c8931eaf89779
-  data.tar.gz: 40751a6bb5d41fc38d09a3990340ae6318d0a99e9a001ce321363b153e865b32391680df625a019a9dc21b324d5d927fc313146c8b8988ecbcfa50d7198ee170
+  metadata.gz: 7f663caa0b96e5f80b16960adccd25d911be1e4b8e810fe68b5023a968e043a36da7041faec1b103639419610fb2a505438da6a87df6e3961dca6e2ffd12ddf0
+  data.tar.gz: 515388b00480af403af56f60b5ba38e3c0ab71fe257a84c47b33c220eaaee86d827f43e3bd5a037b427c2007c6e1cb680efdfa5abe808ac2b16b32604f2386e2

data/lib/rmatrix/matrix.rb

@@ -429,6 +429,15 @@ TEX
       end
     end
 
+    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)
+        end
+      end
+    end
+
     def self.gen_matrix_delegator(name)
       define_method(name) do |*args, &blk|
         Matrix.new(matrix.send(name, *args, &blk), typecode)
@@ -474,7 +483,8 @@ TEX
     end
 
     [:fill!, :random!, :indgen!].each(&method(:gen_mutator))
-    [:reshape, :sort, :sort_index, :inverse, :lu, :delete_at, :where, :where2, :not, :-@, :reverse, :diagonal, :conjugate].each(&method(:gen_matrix_delegator))
+    [:reshape, :inverse, :lu, :diagonal, :conjugate].each(&method(:gen_matrix_delegator))
+    [:sort, :sort_index, :delete_at, :where, :where2, :not, :-@, :reverse].each(&method(:gen_vec_or_matrix_delegator))
     [:prod, :min, :max, :stddev, :mean, :rms, :rmsdev, :shape, :empty?].each(&method(:gen_delegator))
     [:byte, :sint, :int, :sfloat, :float, :scomplex, :complex, :object].each(&method(:gen_typeconstructor))
     [:+, :/, :-, :**, :&, :^, :|].each do |_op|
@@ -493,7 +503,6 @@ TEX
     end
 
     def to_a
-      return narray.reshape(narray.length).to_a if is_vector?
       return narray.to_a
     end
 

data/lib/rmatrix/vector.rb

@@ -23,6 +23,10 @@ module RMatrix
       end
     end
 
+    def to_a
+      return narray.reshape(narray.length).to_a
+    end
+
     def inspect
       self.class.inspect_vector(self)
     end

data/lib/rmatrix/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmatrix
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler