rmatrix 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e572268a9fa4fd04c2ac166d7141581ca677edd0
-  data.tar.gz: 41f62ceec7f2c54bc3b13899e479dbf8f433a5ca
+  metadata.gz: 1809c8900de92ab3be5076af4ccd7793213f62fc
+  data.tar.gz: 42c42b421b98c28f96a7e0ee22b51c45f5562a97
 SHA512:
-  metadata.gz: a75e6d8d05a41a7c830e6d50853c26c33233e0463d55a8afc3cf170be5bbaf2d3d090ec95929465eb930be8fcc4f3e3418666db70c122705904f21c7faed4e8a
-  data.tar.gz: 40cbe6898a74869c74a411357eec77f5ea7aa2ce3c857d674cc884115123d11157317ae276999e9f053cf205c143b1ae791d2b37295cb4cd790526dfa9b368de
+  metadata.gz: 6f0ea097bd582f947b4b19fe7cfc762b31f456a9fd98a6c25ad9b9253ef7c69e19e715e7d193e5cb1e64b30d27350ec467045ac1ef6da08f2cc4c1f20770a226
+  data.tar.gz: fa8cbee25a028eb34ad995f7bc76690c41590a9a5cdc2601bef1c1d48671ed730f5f2954c39dfe4d0587e43b94f300fd6429ba721f50305addd6d5bd29b5c340

data/lib/rmatrix/matrix.rb

@@ -5,9 +5,8 @@ module RMatrix
 
     attr_accessor :invert_next_operation, :matrix, :narray, :typecode
 
-    def initialize(source, narray: nil)
-      self.typecode = 'float'
-
+    def initialize(source, narray: nil, typecode: 'float')
+      self.typecode = typecode
       if [Symbol, String].include?(source.class)
         dimensions = "#{source}".split("x").map(&:to_i)
         source = NArray.new(typecode, dimensions.inject(:*)).reshape(dimensions[1], dimensions[0])
@@ -41,7 +40,7 @@ module RMatrix
           yield elm
         end
       ).to_type(typecode)
-      Matrix.new(as_na.reshape(*shape))
+      Matrix.new(as_na.reshape(*shape), typecode: typecode)
     end
 
     def coerce(other)
@@ -62,11 +61,11 @@ module RMatrix
     end
 
     def sum_rows
-      Matrix.new(sum(0))
+      Matrix.new(sum(0), typecode: typecode)
     end
 
     def sum_columns
-      Matrix.new(sum(1))
+      Matrix.new(sum(1), typecode: typecode)
     end
 
     def two_dimensional(source, type)
@@ -97,7 +96,7 @@ module RMatrix
           result[i] << cofactor(i, j)
         end
       end
-      return Matrix.new(result)
+      return Matrix.new(result, typecode: typecode)
     end
 
     def determinant
@@ -119,14 +118,14 @@ module RMatrix
     def *(other)
       if other.kind_of?(Matrix)
         raise "Matrix A columns(#{self.columns}) != Matrix B rows(#{other.columns})" if other.rows != self.columns
-        Matrix.new(self.matrix * other.matrix)
+        Matrix.new(self.matrix * other.matrix, typecode: typecode)
       else
-        Matrix.new(apply_scalar(:*, other))
+        Matrix.new(apply_scalar(:*, other), typecode: typecode)
       end
     end
 
     def mult(other)
-      apply_elementwise(:*, other)
+      Matrix.new(apply_elementwise(:*, other), typecode: typecode)
     end
 
     def ==(other)
@@ -162,18 +161,18 @@ module RMatrix
 
 
     def [](*args)
-      args.any?{|x| Range === x} ? Matrix.new(narray[*args.reverse]) : narray[*args.reverse]
+      args.all?{|x| Fixnum === x } ? narray[*args.reverse] : Matrix.new(narray[*args.reverse], typecode: typecode)
     end
 
     def transpose
-      Matrix.new(self.matrix.transpose)
+      Matrix.new(self.matrix.transpose, typecode: typecode)
     end
 
     def self.new(*args, &blk)
       result = super
       if result.class == Matrix && (result.rows == 1 || result.columns == 1)
         vect = V[1]
-        vect.matrix, vect.narray = result.matrix, result.narray
+        vect.typecode, vect.matrix, vect.narray = result.typecode, result.matrix, result.narray
         result = vect
       end
       result
@@ -183,7 +182,11 @@ module RMatrix
       if inputs.length == 1 && Matrix === inputs[0]
         inputs[0]
       elsif inputs.length == 1 && [String, Symbol].include?(inputs[0].class)
-        Matrix.new(inputs[0])
+        if ['byte', 'sint', 'int', 'sfloat', 'float', 'scomplex', 'complex', 'object'].include?(inputs[0])
+          ->(*source){ Matrix.new(source, typecode: inputs[0]) }
+        else
+          Matrix.new(inputs[0])
+        end
       else
         Matrix.new(inputs)
       end
@@ -198,7 +201,7 @@ module RMatrix
 
     def self.gen_matrix_delegator(name)
       define_method(name) do |*args, &blk|
-        Matrix.new(matrix.send(name, *args, &blk))
+        Matrix.new(matrix.send(name, *args, &blk), typecode: typecode)
       end
     end
 
@@ -208,6 +211,12 @@ module RMatrix
       end
     end
 
+    def self.gen_typeconstructor(name)
+      define_singleton_method(name) do
+        ->(*source){ Matrix.new(source, typecode: name.to_s) }
+      end
+    end
+
     OPERATIONS_MAP = {
       :& => 'and',
       :^ => 'xor',
@@ -218,17 +227,20 @@ module RMatrix
     end
 
     [:fill!, :random!, :indgen!].each(&method(:gen_mutator))
-    [:reshape, :sort, :sort_index, :inverse, :lu, :delete_at, :where, :where2, :not].each(&method(:gen_matrix_delegator))
+    [:reshape, :sort, :sort_index, :inverse, :lu, :delete_at, :where, :where2, :not, :-@].each(&method(:gen_matrix_delegator))
     [:sum, :prod, :mean, :stddev, :rms, :rmsdev, :min, :max, :shape].each(&method(:gen_delegator))
+    [:byte, :sint, :int, :sfloat, :float, :scomplex, :complex, :object].each(&method(:gen_typeconstructor))
+
     [:+, :/, :-, :**, :&, :^, :|].each do |op|
       define_method(op) do |other|
         op = translate_op(op)
+        result = if other.kind_of?(Matrix)
+          apply_elementwise(op, other)
+        else
+          apply_scalar(op, other)
+        end
         Matrix.new(
-          if other.kind_of?(Matrix)
-            apply_elementwise(op, other)
-          else
-            apply_scalar(op, other)
-          end
+          result, typecode: typecode
         )
       end
     end
@@ -254,7 +266,7 @@ module RMatrix
         if test_inverse
           other.narray.send(op, self.narray)
         else
-          narray.send(op, other.narray)
+          narray.send(op, Matrix[other].narray)
         end
       end
 

data/lib/rmatrix/vector.rb

@@ -7,7 +7,15 @@ module RMatrix
     end
 
     def self.[](*inputs)
-      Vector.new(inputs)
+      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, typecode: inputs[0].to_s) }
+        else
+          Vector.new(inputs[0])
+        end
+      else
+        Vector.new(inputs)
+      end
     end
 
     def inspect

data/lib/rmatrix/version.rb

@@ -1,3 +1,3 @@
 module Rmatrix
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

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