fast_matrix 0.2.0 → 0.3.0

data/ext/fast_matrix/c_include.c

@@ -6,3 +6,6 @@
 
 #include "Vector/vector.c"
 #include "Vector/c_vector.c"
+
+#include "LUPDecomposition/lup.c"
+#include "LUPDecomposition/c_lup.c"

data/ext/fast_matrix/fast_matrix.c

@@ -1,5 +1,8 @@
 #include "fast_matrix.h"
-#include <stdio.h>
+#include "Helper/errors.h"
+#include "Matrix/matrix.h"
+#include "Vector/vector.h"
+#include "LUPDecomposition/lup.h"
 
 
 void Init_fast_matrix()
@@ -7,4 +10,5 @@ void Init_fast_matrix()
     init_fm_errors();
     init_fm_matrix();
     init_fm_vector();
-}
+    init_fm_lup();
+}

data/ext/fast_matrix/fast_matrix.h

@@ -1,10 +1,6 @@
 #ifndef FAST_MATRIX_H
 #define FAST_MATRIX_H 1
 
-#include "Helper/errors.h"
-#include "Matrix/matrix.h"
-#include "Vector/vector.h"
-
 void Init_fast_matrix();
 
 #endif /* FAST_MATRIX_H */

data/lib/errors.rb

@@ -5,5 +5,5 @@ module FastMatrix
 
   class Error < StandardError; end
   class NotSupportedError < NotImplementedError; end
-
+  class OperationNotDefinedError < Error; end
 end

data/lib/fast_matrix.rb

@@ -1,4 +1,5 @@
 require 'fast_matrix/version'
 require 'vector/vector'
 require 'matrix/matrix'
+require 'lup_decomposition/lup_decomposition'
 require 'scalar'

data/lib/fast_matrix/version.rb

@@ -1,3 +1,3 @@
 module FastMatrix
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/lup_decomposition/lup_decomposition.rb

@@ -0,0 +1,24 @@
+require 'fast_matrix/fast_matrix'
+
+module FastMatrix
+
+    class Matrix
+        #   LUP decomposition for Matrix
+        class LUPDecomposition
+            # 
+            # Returns L, U, P in an array
+            #             
+            def to_ary
+                [l, u, p]
+            end
+            # 
+            # alias for determinant method
+            #             
+            alias determinant det
+            # 
+            # alias for to_ary method 
+            # 
+            alias to_a to_ary
+        end
+    end
+end

data/lib/matrix/matrix.rb

@@ -13,12 +13,100 @@ module FastMatrix
     # Returns the number of columns.
     #
     alias column_size column_count
+    # 
+    # Returns the inverse of the matrix.
+    # 
+    alias inv inverse
+    alias entrywise_product hadamard_product
     #
     # Returns element (+i+,+j+) of the matrix.  That is: row +i+, column +j+.
     #
     alias element []
     alias component []
 
+    alias lup_decomposition lup
+    alias t transpose
+    alias tr trace
+
+    alias skew_symmetric? antisymmetric?
+    # 
+    # In real numbers is equivalent to checking for symmetry
+    #     
+    alias hermitian? symmetric?
+
+    #
+    # Explicit conversion to a Matrix. Returns self
+    #
+    def to_matrix
+      self
+    end
+
+    def empty?
+      row_count * column_count == 0
+    end
+
+    #     
+    # Returns true if this is a singular matrix.
+    #     
+    def singular?
+      determinant == 0
+    end
+    
+    # 
+    # Returns true if this is a regular (i.e. non-singular) matrix.
+    #     
+    def regular?
+      not singular?
+    end
+
+    # 
+    # Returns true if this is a square matrix.
+    #     
+    def square?
+      column_count == row_count
+    end
+
+    # 
+    # Returns the imaginary part of the matrix.
+    # Always returns a zero matrix
+    #     
+    def imaginary()
+      Matrix.zero(row_count, column_count)
+    end
+
+    alias imag imaginary
+
+    # 
+    # Laplace expansion is equal to the determinant in the real numbers
+    # 
+    def laplace_expansion(row: nil, column: nil) 
+      determinant
+    end
+    alias cofactor_expansion laplace_expansion
+
+    # 
+    # Returns an array containing matrices corresponding to the real and imaginary parts of the matrix
+    #     
+    def rect
+      [real, imag]
+    end
+
+    alias rectangular rect
+
+    # 
+    # Conjugate real matrix is equal to this matrix
+    #     
+    alias conjugate to_matrix
+    alias conj conjugate
+    # 
+    # Real method in real matrix is equal to this matrix
+    #     
+    alias real to_matrix
+
+    def real?
+      true
+    end
+
     def collect
       collected_rows = []
       rows.each do |i|

data/lib/scalar.rb

@@ -1,4 +1,5 @@
 require 'fast_matrix/fast_matrix'
+require 'errors'
 
 module FastMatrix
 
@@ -13,7 +14,7 @@ module FastMatrix
     def coerce(other)
       case other
       when Numeric
-        return Scalar.new(other), self
+        [Scalar.new(other), self]
       else
         raise TypeError, "#{self.class} can't be coerced into #{other.class}"
       end
@@ -31,21 +32,38 @@ module FastMatrix
     def coerce(other)
       case other
       when Numeric
-        return Scalar.new(other), self
+        [Scalar.new(other), self]
       else
         raise TypeError, "#{self.class} can't be coerced into #{other.class}"
       end
     end
   end
 
-  private
-
   class Scalar < Numeric # :nodoc:
+    attr_reader :value
 
     def initialize(value)
       @value = value
     end
 
+    def +(other)
+      case other
+      when Vector, Matrix
+        raise OperationNotDefinedError, "#{@value.class}+#{other.class}"
+      else
+        Scalar.new(@value + other)
+      end
+    end
+
+    def -(other)
+      case other
+      when Vector, Matrix
+        raise OperationNotDefinedError, "#{@value.class}+#{other.class}"
+      else
+        Scalar.new(@value - other)
+      end
+    end
+
     def *(other)
       case other
       when Vector, Matrix
@@ -54,5 +72,38 @@ module FastMatrix
         Scalar.new(@value * other)
       end
     end
+
+    def /(other)
+      case other
+      when Vector
+        raise OperationNotDefinedError, "#{@value.class}/#{other.class}"
+      when Matrix
+        self * other.inverse
+      else
+        Scalar.new(@value / other)
+      end
+    end
+
+    def **(other)
+      case other
+      when Vector, Matrix
+        raise OperationNotDefinedError, "#{@value.class}**#{other.class}"
+      else
+        Scalar.new(@value**other)
+      end
+    end
+
+    def ==(other)
+      case other
+      when Scalar
+        other.value == @value
+      else
+        @value == other
+      end
+    end
+
+    def coerce(other)
+      @value.coerce(other)
+    end
   end
 end

data/lib/vector/vector.rb

@@ -3,6 +3,11 @@ require 'vector/constructors'
 module FastMatrix
   class Vector
 
+    alias cross cross_product
+    alias dot inner_product
+    alias r magnitude
+    alias norm magnitude
+
     #
     # Create fast vector from standard vector
     #
@@ -31,7 +36,7 @@ module FastMatrix
     # Iterate over the elements of this vector
     #
     def each
-      raise NotSupportedError unless block_given?
+      return to_enum :each unless block_given?
 
       (0...size).each do |i|
         yield self[i]
@@ -40,6 +45,8 @@ module FastMatrix
     end
 
     def each_with_index
+      return to_enum :each_with_index unless block_given?
+
       (0...size).each do |i|
         yield self[i], i
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_matrix
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - mmcs_ruby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,11 @@ files:
 - ext/fast_matrix/Helper/c_array_operations.h
 - ext/fast_matrix/Helper/errors.c
 - ext/fast_matrix/Helper/errors.h
+- ext/fast_matrix/LUPDecomposition/c_lup.c
+- ext/fast_matrix/LUPDecomposition/c_lup.h
+- ext/fast_matrix/LUPDecomposition/helper.h
+- ext/fast_matrix/LUPDecomposition/lup.c
+- ext/fast_matrix/LUPDecomposition/lup.h
 - ext/fast_matrix/Matrix/c_matrix.c
 - ext/fast_matrix/Matrix/c_matrix.h
 - ext/fast_matrix/Matrix/errors.h
@@ -121,6 +126,7 @@ files:
 - lib/errors.rb
 - lib/fast_matrix.rb
 - lib/fast_matrix/version.rb
+- lib/lup_decomposition/lup_decomposition.rb
 - lib/matrix/constructors.rb
 - lib/matrix/matrix.rb
 - lib/scalar.rb