nmatrix 0.2.0 → 0.2.1

data/lib/nmatrix/nmatrix.rb

@@ -600,13 +600,15 @@ class NMatrix
   #   - A copy of the matrix, but transposed.
   #
   def transpose(permute = nil)
-    if self.dim == 1
-      return self.clone
-    elsif self.dim == 2
-      new_shape = [self.shape[1], self.shape[0]]
-    elsif permute.nil?
-      raise(ArgumentError, "need permutation array of size #{self.dim}")
-    elsif permute.sort.uniq != (0...self.dim).to_a
+    if permute.nil?
+      if self.dim == 1
+        return self.clone
+      elsif self.dim == 2
+        new_shape = [self.shape[1], self.shape[0]]
+      else
+        raise(ArgumentError, "need permutation array of size #{self.dim}")
+      end
+    elsif !permute.is_a?(Array) || permute.sort.uniq != (0...self.dim).to_a
       raise(ArgumentError, "invalid permutation array")
     else
       # Figure out the new shape based on the permutation given as an argument.
@@ -1030,7 +1032,7 @@ protected
     ary << "shape:[#{shape.join(',')}]" << "dtype:#{dtype}" << "stype:#{stype}"
 
     if stype == :yale
-      ary <<	"capacity:#{capacity}"
+      ary << "capacity:#{capacity}"
 
       # These are enabled by the DEBUG_YALE compiler flag in extconf.rb.
       if respond_to?(:__yale_a__)

data/lib/nmatrix/shortcuts.rb

@@ -91,9 +91,9 @@ class NMatrix
     #
     # SYNTAX COMPARISON:
     #
-    #   MATLAB:		a = [ [1 2 3] ; [4 5 6] ]   or  [ 1 2 3 ; 4 5 6 ]
-    #   IDL:			a = [ [1,2,3] , [4,5,6] ]
-    #   NumPy:		a = array( [1,2,3], [4,5,6] )
+    #   MATLAB:  a = [ [1 2 3] ; [4 5 6] ]   or  [ 1 2 3 ; 4 5 6 ]
+    #   IDL:   a = [ [1,2,3] , [4,5,6] ]
+    #   NumPy:  a = array( [1,2,3], [4,5,6] )
     #
     #   SciRuby:      a = NMatrix[ [1,2,3], [4,5,6] ]
     #   Ruby array:   a =  [ [1,2,3], [4,5,6] ]

data/lib/nmatrix/version.rb

@@ -9,8 +9,8 @@
 #
 # == Copyright Information
 #
-# SciRuby is Copyright (c) 2010 - 2014, Ruby Science Foundation
-# NMatrix is Copyright (c) 2012 - 2014, John Woods and the Ruby Science Foundation
+# SciRuby is Copyright (c) 2010 - 2016, Ruby Science Foundation
+# NMatrix is Copyright (c) 2012 - 2016, John Woods and the Ruby Science Foundation
 #
 # Please see LICENSE.txt for additional copyright notices.
 #
@@ -29,7 +29,7 @@ class NMatrix
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY = 0
+    TINY = 1
     #PRE = "a"
 
     STRING = [MAJOR, MINOR, TINY].compact.join(".")

data/spec/00_nmatrix_spec.rb

@@ -461,6 +461,12 @@ describe 'NMatrix' do
         expect(n.transpose).to eq n
         expect(n.transpose).not_to be n
       end
+
+      it "should check permute argument if supplied for #{stype} matrix" do
+        n = NMatrix.new([2,2], [1,2,3,4], stype: stype)
+        expect{n.transpose *4 }.to raise_error(ArgumentError)
+        expect{n.transpose [1,1,2] }.to raise_error(ArgumentError)
+      end
     end
   end
 

data/spec/math_spec.rb

@@ -553,6 +553,7 @@ describe "math" do
   context "#solve" do
     NON_INTEGER_DTYPES.each do |dtype|
       next if dtype == :object # LU factorization doesnt work for :object yet
+
       it "solves linear equation for dtype #{dtype}" do
         a = NMatrix.new [2,2], [3,1,1,2], dtype: dtype
         b = NMatrix.new [2,1], [9,8], dtype: dtype
@@ -581,6 +582,82 @@ describe "math" do
         expect(a.solve(b)).to eq(NMatrix.new [3,2], [1,0, 0,0, 2,2], dtype: dtype)
       end
     end
+
+    FLOAT_DTYPES.each do |dtype|
+      context "when form: :lower_tri" do
+        let(:a) { NMatrix.new([3,3], [1, 0, 0, 2, 0.5, 0, 3, 3, 9], dtype: dtype) }
+
+        it "solves a lower triangular linear system A * x = b with vector b" do
+          b = NMatrix.new([3,1], [1,2,3], dtype: dtype)
+          x = a.solve(b, form: :lower_tri)
+          r = a.dot(x) - b
+          expect(r.abs.max).to be_within(1e-6).of(0.0)
+        end
+
+        it "solves a lower triangular linear system A * X = B with narrow B" do
+          b = NMatrix.new([3,2], [1,2,3,4,5,6], dtype: dtype)
+          x = a.solve(b, form: :lower_tri)
+          r = (a.dot(x) - b).abs.to_flat_a
+          expect(r.max).to be_within(1e-6).of(0.0)
+        end
+
+        it "solves a lower triangular linear system A * X = B with wide B" do
+          b = NMatrix.new([3,5], (1..15).to_a, dtype: dtype)
+          x = a.solve(b, form: :lower_tri)
+          r = (a.dot(x) - b).abs.to_flat_a
+          expect(r.max).to be_within(1e-6).of(0.0)
+        end
+      end
+
+      context "when form: :upper_tri" do
+        let(:a) { NMatrix.new([3,3], [3, 2, 1, 0, 2, 0.5, 0, 0, 9], dtype: dtype) }
+
+        it "solves an upper triangular linear system A * x = b with vector b" do
+          b = NMatrix.new([3,1], [1,2,3], dtype: dtype)
+          x = a.solve(b, form: :upper_tri)
+          r = a.dot(x) - b
+          expect(r.abs.max).to be_within(1e-6).of(0.0)
+        end
+
+        it "solves an upper triangular linear system A * X = B with narrow B" do
+          b = NMatrix.new([3,2], [1,2,3,4,5,6], dtype: dtype)
+          x = a.solve(b, form: :upper_tri)
+          r = (a.dot(x) - b).abs.to_flat_a
+          expect(r.max).to be_within(1e-6).of(0.0)
+        end
+
+        it "solves an upper triangular linear system A * X = B with a wide B" do
+          b = NMatrix.new([3,5], (1..15).to_a, dtype: dtype)
+          x = a.solve(b, form: :upper_tri)
+          r = (a.dot(x) - b).abs.to_flat_a
+          expect(r.max).to be_within(1e-6).of(0.0)
+        end
+      end
+
+      context "when form: :pos_def" do
+        let(:a) { NMatrix.new([3,3], [4, 1, 2, 1, 5, 3, 2, 3, 6], dtype: dtype) }
+
+        it "solves a linear system A * X = b with positive definite A and vector b" do
+          b = NMatrix.new([3,1], [6,4,8], dtype: dtype)
+          begin
+            x = a.solve(b, form: :pos_def)
+            expect(x).to be_within(1e-6).of(NMatrix.new([3,1], [1,0,1], dtype: dtype))
+          rescue NotImplementedError
+            "Suppressing a NotImplementedError when the lapacke or atlas plugin is not available"
+          end
+        end
+      
+        it "solves a linear system A * X = B with positive definite A and matrix B" do
+          b = NMatrix.new([3,2], [8,3,14,13,14,19], dtype: dtype)
+          begin
+            x = a.solve(b, form: :pos_def)
+            expect(x).to be_within(1e-6).of(NMatrix.new([3,2], [1,-1,2,1,1,3], dtype: dtype))
+          rescue NotImplementedError
+            "Suppressing a NotImplementedError when the lapacke or atlas plugin is not available"
+          end
+        end
+      end
+    end
   end
 
   context "#hessenberg" do

data/spec/spec_helper.rb

@@ -138,3 +138,12 @@ end
 def integer_dtype? dtype
   [:byte,:int8,:int16,:int32,:int64].include?(dtype)
 end
+
+# If a focus: true option is supplied to any test, running `rake spec focus=true`
+# will run only the focused tests and nothing else.
+if ENV["focus"] == "true"
+  RSpec.configure do |c|
+    c.filter_run :focus => true
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nmatrix
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - John Woods
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packable