fast_matrix 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31d4bbeb84c105ff8d28f067b375ff1b89120589baf84d5cff5a175db54f1522
-  data.tar.gz: d8988e813b690465c0716b62b61cf36b71696381688bdcbcb008effd70235cc3
+  metadata.gz: b595a00ec07bf1d240037d16e3691d99f02b1313f0601ddc384c1bbc46378511
+  data.tar.gz: 0bc5cd22534b4add7364cc0531a438e5b909ab157c4778af1aaa3eb13e0afe9c
 SHA512:
-  metadata.gz: d5d202092bbf94928f067f6c600db6075d5b2b7ff7a703a71a6811c667fe40b102611d676b185ebfc267dafb958ac547b1c6a1bcddecf3411306997cea050663
-  data.tar.gz: e829008f0decdf7193fd96f561605496489fab34b0eb67d66ec9d6070c4fa1459a206d375ba529980842a30bc4ffd52b0b34b5eff55dff875dbc5885508170fd
+  metadata.gz: 1eebf62db5b0214d6a04414cff95b6179bcfea2fc972397da325bb8a4efd871768711a9989572d18f7eb6ca1f51da7b0de84d3c1aa56547703ed4e0d72c4958b
+  data.tar.gz: 823754bfaf70c9ec3b1dafe6ba409ec954e332a7d48f66ef8e9327bbddcd9288a8d4dc55f053c990279f1ad17455384d92a68bd7b214e074dbd9f295b98f3019

data/.travis.yml

@@ -2,7 +2,18 @@ language: ruby
 cache: bundler
 rvm:
   - 2.6.5
+env:
+  global:
+    - CC_TEST_REPORTER_ID=$TEST_ID
 before_install: gem install bundler -v 2.0.2
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+script:
+  - bundle exec rake
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 deploy:
   provider: rubygems
   api_key: $API_KEY

data/README.md

@@ -1,4 +1,6 @@
 [![Build Status](https://travis-ci.org/mmcs-ruby/fast_matrix.svg?branch=master)](https://travis-ci.org/mmcs-ruby/fast_matrix)
+[![Maintainability](https://api.codeclimate.com/v1/badges/fd171bae2ca444aaca29/maintainability)](https://codeclimate.com/github/mmcs-ruby/fast_matrix/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/fd171bae2ca444aaca29/test_coverage)](https://codeclimate.com/github/mmcs-ruby/fast_matrix/test_coverage)
 
 # FastMatrix
 

data/ext/fast_matrix/matrix.c

@@ -71,6 +71,9 @@ VALUE matrix_set(VALUE self, VALUE row, VALUE column, VALUE v)
 
 	struct matrix* data;
 	TypedData_Get_Struct(self, struct matrix, &matrix_type, data);
+    
+    m = (m < 0) ? data->m + m : m;
+    n = (n < 0) ? data->n + n : n;
 
     raise_check_range(m, 0, data->m);
     raise_check_range(n, 0, data->n);
@@ -87,9 +90,12 @@ VALUE matrix_get(VALUE self, VALUE row, VALUE column)
 
 	struct matrix* data;
 	TypedData_Get_Struct(self, struct matrix, &matrix_type, data);
-
-    raise_check_range(m, 0, data->m);
-    raise_check_range(n, 0, data->n);
+    
+    m = (m < 0) ? data->m + m : m;
+    n = (n < 0) ? data->n + n : n;
+    
+    if(m < 0 || n < 0 || n >= data->n || m >= data->m)
+        return Qnil;
 
     return DBL2NUM(data->data[m + data->m * n]);
 }
@@ -517,6 +523,51 @@ VALUE matrix_sub_with(VALUE self, VALUE value)
     return result;
 }
 
+double determinant(int n, const double* A)
+{
+    double* M = malloc(n * n * sizeof(double));
+    double det = 1;
+    copy_d_array(n * n, A, M);
+
+    for(int i = 0; i < n; ++i)
+    {
+        const double* line_p = M + i + i * n;
+        double current = *line_p; 
+        det *= current;
+
+        if(current == 0)
+        {
+            free(M);
+            return 0;
+        }
+
+        for(int j = i + 1; j < n; ++j)
+        {
+            double* t_line = M + i + j * n;
+            double head = *t_line;
+            for(int k = 1; k < n - i; ++k)
+                t_line[k] -= line_p[k] * head / current;
+        }
+    }
+
+    free(M);
+    return det;
+}
+
+VALUE matrix_determinant(VALUE self)
+{
+    struct matrix* A;
+    TypedData_Get_Struct(self, struct matrix, &matrix_type, A);
+
+    
+    int m = A->m;
+    int n = A->n;
+    if(m != n)
+        rb_raise(fm_eIndexError, "Not a square matrix");
+
+    return DBL2NUM(determinant(n, A->data));
+}
+
 VALUE matrix_sub_from(VALUE self, VALUE value)
 {
 	struct matrix* A;
@@ -546,6 +597,24 @@ VALUE matrix_fill(VALUE self, VALUE value)
     return self;
 }
 
+VALUE matrix_equal(VALUE self, VALUE value)
+{
+	struct matrix* A;
+    struct matrix* B;
+	TypedData_Get_Struct(self, struct matrix, &matrix_type, A);
+	TypedData_Get_Struct(value, struct matrix, &matrix_type, B);
+
+    if(A->n != B->n || A->m != B->m)
+		return Qfalse;
+
+    int n = A->n;
+    int m = B->m;
+
+    if(equal_d_arrays(n * m, A->data, B->data))
+		return Qtrue;
+	return Qfalse;
+}
+
 VALUE matrix_abs(VALUE self)
 {
 	struct matrix* A;
@@ -604,4 +673,6 @@ void init_fm_matrix()
     rb_define_method(cMatrix, "strassen", strassen, 1);
     rb_define_method(cMatrix, "abs", matrix_abs, 0);
     rb_define_method(cMatrix, ">=", matrix_greater_or_equal, 1);
+    rb_define_method(cMatrix, "determinant", matrix_determinant, 0);
+    rb_define_method(cMatrix, "eql?", matrix_equal, 1);
 }

data/ext/fast_matrix/vector.c

@@ -69,6 +69,7 @@ VALUE vector_set(VALUE self, VALUE idx, VALUE v)
 	struct vector* data;
 	TypedData_Get_Struct(self, struct vector, &vector_type, data);
 
+    i = (i < 0) ? data->n + i : i;
     raise_check_range(i, 0, data->n);
 
     data->data[i] = x;
@@ -83,7 +84,10 @@ VALUE vector_get(VALUE self, VALUE idx)
 	struct vector* data;
 	TypedData_Get_Struct(self, struct vector, &vector_type, data);
 
-    raise_check_range(i, 0, data->n);
+    i = (i < 0) ? data->n + i : i;
+    
+    if(i < 0 || i >= data->n)
+        return Qnil;
 
     return DBL2NUM(data->data[i]);
 }
@@ -267,7 +271,7 @@ void init_fm_vector()
 	rb_define_method(cVector, "size", c_vector_size, 0);
 	rb_define_method(cVector, "+", vector_add_with, 1);
 	rb_define_method(cVector, "+=", vector_add_from, 1);
-	rb_define_method(cVector, "==", vector_equal, 1);
+	rb_define_method(cVector, "eql?", vector_equal, 1);
 	rb_define_method(cVector, "clone", vector_copy, 0);
 	rb_define_method(cVector, "*", vector_multiply, 1);
 }

data/fast_matrix.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'simplecov'
 end

data/lib/fast_matrix.rb

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

data/lib/fast_matrix/version.rb

@@ -1,3 +1,3 @@
 module FastMatrix
-  VERSION = "0.1.5"
+  VERSION = '0.1.6'
 end

data/lib/matrix/constructors.rb

@@ -6,7 +6,6 @@ module FastMatrix
   # Constructors as in the standard matrix
   #
   class Matrix
-
     #
     # Creates a matrix of size +row_count+ x +column_count+.
     # It fills the values by calling the given block,
@@ -19,10 +18,10 @@ module FastMatrix
     #     => a 3x3 matrix with random elements
     #
     def self.build(row_count, column_count = row_count, &block)
-      check_dimensions(row_count, column_count)
-      matrix = self.new(row_count, column_count)
-      matrix.each_with_index! { |_, i, j| block.call(i, j) } if block_given?
-      matrix
+      matrix = create_with_check(row_count, column_count)
+      raise NotImplementedError, 'Issue#17' unless block_given?
+
+      matrix.each_with_index! { |_, i, j| block.call(i, j) }
     end
 
     #
@@ -68,7 +67,7 @@ module FastMatrix
     #        6
     #
     def self.column_vector(column)
-      matrix = Matrix.build(column.size, 1)
+      matrix = create_with_check(column.size, 1)
       column.each_with_index { |elem, i| matrix[i, 0] = elem }
       matrix
     end
@@ -80,7 +79,7 @@ module FastMatrix
     #     => 4 5 6
     #
     def self.row_vector(row)
-      matrix = Matrix.build(1, row.size)
+      matrix = create_with_check(1, row.size)
       row.each_with_index { |elem, j| matrix[0, j] = elem }
       matrix
     end
@@ -93,8 +92,7 @@ module FastMatrix
     #         0  0 -3
     #
     def self.diagonal(*values)
-      matrix = Matrix.build(values.size, values.size) { |i, j| i == j ? values[i] : 0 }
-      matrix
+      build(values.size, values.size) { |i, j| i == j ? values[i] : 0 }
     end
 
     #
@@ -105,7 +103,7 @@ module FastMatrix
     #        0 5
     #
     def self.scalar(n, value)
-      Matrix.build(n, n) { |i, j| i == j ? value : 0 }
+      build(n, n) { |i, j| i == j ? value : 0 }
     end
 
     #
@@ -122,14 +120,24 @@ module FastMatrix
       alias I identity
     end
 
+    ##
+    # Creates a filled matrix
+    # Matrix.fill(42, 2, 4)
+    #     =>  42 42 42 42
+    #         42 42 42 42
+    ##
+    def self.fill(value, row_count, column_count = row_count)
+      create_with_check(row_count, column_count).fill!(value)
+    end
+
     #
-    # Creates a zero matrix +n+ by +n+.
-    #   Matrix.zero(2)
-    #     => 0 0
-    #        0 0
+    # Creates a zero matrix +row_count+ by +column_count+.
+    #   Matrix.zero(2, 3)
+    #     => 0 0 0
+    #        0 0 0
     #
-    def self.zero(n)
-      Matrix.build(n, n) { 0 }
+    def self.zero(row_count, column_count = row_count)
+      fill(0, row_count, column_count)
     end
 
     #
@@ -199,7 +207,7 @@ module FastMatrix
     #   Matrix.combine(x, y) {|a, b| a - b} # => Matrix[[5, 4], [1, 0]]
     # TODO: optimize in C
     def self.combine(*matrices)
-      return Matrix.empty if matrices.empty?
+      return empty if matrices.empty?
 
       result = convert(matrices.first)
       matrices[1..matrices.size].each do |m|
@@ -214,6 +222,11 @@ module FastMatrix
     class << Matrix
       private
 
+      def create_with_check(row_count, column_count)
+        check_dimensions(row_count, column_count)
+        new(row_count, column_count)
+      end
+
       def check_empty_matrix(row_count, column_count)
         empty if row_count.zero? || column_count.zero?
       end
@@ -237,7 +250,7 @@ module FastMatrix
       def lines(lines, main_is_rows)
         sizes = [lines.size, (lines[0] || []).size]
         offset = main_is_rows ? 0 : -1
-        matrix = build(sizes[offset], sizes[1 + offset])
+        matrix = create_with_check(sizes[offset], sizes[1 + offset])
         lines.each_with_index do |second_dim, main_index|
           raise IndexError if second_dim.size != sizes[1]
 

data/lib/matrix/matrix.rb

@@ -66,7 +66,7 @@ module FastMatrix
 
     # FIXME: for compare with standard matrix
     def ==(other)
-      # TODO: check class and use fast compare from C if possibly
+      return eql?(other) if other.class == Matrix
       return false unless %i[row_size column_size \[\]].all? { |x| other.respond_to? x }
       return false unless self.row_size == other.row_size && self.column_size == other.column_size
 

data/lib/scalar.rb

@@ -0,0 +1,58 @@
+require 'fast_matrix/fast_matrix'
+
+module FastMatrix
+
+  class Matrix
+    #
+    # The coerce method provides support for Ruby type coercion.
+    # This coercion mechanism is used by Ruby to handle mixed-type
+    # numeric operations: it is intended to find a compatible common
+    # type between the two operands of the operator.
+    # See also Numeric#coerce.
+    #
+    def coerce(other)
+      case other
+      when Numeric
+        return Scalar.new(other), self
+      else
+        raise TypeError, "#{self.class} can't be coerced into #{other.class}"
+      end
+    end
+  end
+
+  class Vector
+    #
+    # The coerce method provides support for Ruby type coercion.
+    # This coercion mechanism is used by Ruby to handle mixed-type
+    # numeric operations: it is intended to find a compatible common
+    # type between the two operands of the operator.
+    # See also Numeric#coerce.
+    #
+    def coerce(other)
+      case other
+      when Numeric
+        return Scalar.new(other), self
+      else
+        raise TypeError, "#{self.class} can't be coerced into #{other.class}"
+      end
+    end
+  end
+
+  private
+
+  class Scalar < Numeric # :nodoc:
+
+    def initialize(value)
+      @value = value
+    end
+
+    def *(other)
+      case other
+      when Vector, Matrix
+        other * @value
+      else
+        Scalar.new(@value * other)
+      end
+    end
+  end
+end

data/lib/vector/vector.rb

@@ -3,6 +3,24 @@ require 'vector/constructors'
 module FastMatrix
   class Vector
 
+    #
+    # Create fast vector from standard vector
+    #
+    def self.convert(vector)
+      elements(vector)
+    end
+
+    #
+    # Convert to standard ruby vector.
+    #
+    def convert
+      ::Vector.elements(self)
+    end
+
+    def to_ary
+      Array.new(size) { |i| self[i] }
+    end
+
     def each_with_index
       (0...size).each do |i|
         yield self[i], i
@@ -16,5 +34,17 @@ module FastMatrix
       self
     end
 
+    # FIXME: for compare with standard vector
+    def ==(other)
+      return eql?(other) if other.class == Vector
+      return false unless %i[size \[\]].all? { |x| other.respond_to? x }
+      return false unless self.size == other.size
+
+      result = true
+      each_with_index do |elem, i|
+        result &&= elem == other[i].to_f
+      end
+      result
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_matrix
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - mmcs_ruby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby wrapper around C matrices implementation
 email:
 - poganesyan@sfedu.ru
@@ -100,6 +114,7 @@ files:
 - lib/fast_matrix/version.rb
 - lib/matrix/constructors.rb
 - lib/matrix/matrix.rb
+- lib/scalar.rb
 - lib/vector/constructors.rb
 - lib/vector/vector.rb
 homepage: https://github.com/mmcs-ruby/fast_matrix