nmatrix 0.2.1 → 0.2.3

data/spec/shortcuts_spec.rb

@@ -50,10 +50,45 @@ describe NMatrix do
     expect(m).to eq identity3
   end
 
+  it "hilbert() creates an hilbert matrix" do
+    m = NMatrix.hilbert(8)
+    expect(m[4, 0]).to be_within(0.000001).of(0.2)
+    expect(m[4, 1]).to be_within(0.000001).of(0.16666666666666666)
+    expect(m[4, 2]).to be_within(0.000001).of(0.14285714285714285)
+    expect(m[4, 3]).to be_within(0.000001).of(0.125)
+
+    m = NMatrix.hilbert(3)
+    hilbert3 = NMatrix.new([3, 3], [1.0, 0.5, 0.3333333333333333,\
+     0.5, 0.3333333333333333, 0.25, 0.3333333333333333, 0.25, 0.2])
+    expect(m).to eq hilbert3
+    0.upto(2) do |i|
+      0.upto(2) do |j|
+        expect(m[i, j]).to be_within(0.000001).of(hilbert3[i,j])
+      end
+    end
+  end
+
+  it "inv_hilbert() creates an inverse hilbert matrix" do
+    m = NMatrix.inv_hilbert(6)
+    inv_hilbert6 = [3360.0,  -88200.0,   564480.0, -1411200.0]
+    expect(m[2,0]).to be_within(0.000001).of(inv_hilbert6[0])
+    expect(m[2,1]).to be_within(0.000001).of(inv_hilbert6[1])
+    expect(m[2,2]).to be_within(0.000001).of(inv_hilbert6[2])
+    expect(m[2,3]).to be_within(0.000001).of(inv_hilbert6[3])
+
+    m = NMatrix.inv_hilbert(3)
+    inv_hilbert3 = NMatrix.new([3, 3], [  9.0,  -36.0,   30.0, -36.0,  192.0, -180.0, 30.0, -180.0,  180.0] )
+    0.upto(2) do |i|
+      0.upto(2) do |j|
+        expect(m[i, j]).to be_within(0.000001).of(inv_hilbert3[i,j])
+      end
+    end
+  end
+
   it "diag() creates a matrix with pre-supplied diagonal" do
     arr = [1,2,3,4]
     m = NMatrix.diag(arr)
-    expect(m.is_a?(NMatrix)).to be_true
+    expect(m.is_a?(NMatrix)).to be true
   end
 
   it "diagonals() contains the seeded values on the diagonal" do
@@ -123,6 +158,112 @@ describe NMatrix do
       expect { NMatrix.random("not an array or integer") }.to raise_error
     end
   end
+  
+  context "::magic" do
+    
+    ALL_DTYPES.each do |dtype|
+      context dtype do
+        it "creates a matrix with numbers from 1 to n^n(n squared)" do
+          a = NMatrix.magic(3, dtype: dtype)
+          magic3 = NMatrix.new([3,3], [4, 9, 2, 3, 5, 7, 8, 1, 6], dtype: dtype)	
+          expect(a).to eq magic3
+      
+          b = NMatrix.magic(4, dtype: dtype)
+          magic4 = NMatrix.new([4,4], [1, 15, 14,  4, 12,  6,  7, 9, 8, 10, 11, 5, 13, 3, 2, 16], dtype: dtype)
+          expect(b).to eq magic4
+      
+          c = NMatrix.magic(6, dtype: dtype)
+          magic6 = NMatrix.new([6,6], [31, 9, 2, 22, 27, 20, 3, 32, 7, 21, 23, 25, 35, 1, 6, 26, 19, 24, 4, 36, 29, 13, 18, 11, 30, 5, 34, 12, 14, 16, 8, 28, 33, 17, 10, 15], dtype: dtype)
+          expect(c).to eq magic6  
+        end
+      end
+    end
+    
+    it "shape of two is not allowed" do
+      expect { NMatrix.magic(2) }.to raise_error(ArgumentError)
+    end
+    
+    it "Only accepts an integer as dimension" do 
+      expect { NMatrix.magic(3.0) }.to raise_error(ArgumentError)
+    end
+  end
+  
+  context "::linspace" do
+    it "creates a row vector when given only one shape parameter" do
+      v = NMatrix.linspace(1, 10, 4)
+      #Expect a row vector only
+      expect(v.shape.length).to eq(1)
+      
+      ans = [1.0,4.0,7.0,10.0]
+
+      expect(v[0]).to be_within(0.000001).of(ans[0])
+      expect(v[1]).to be_within(0.000001).of(ans[1])
+      expect(v[2]).to be_within(0.000001).of(ans[2])
+      expect(v[3]).to be_within(0.000001).of(ans[3])
+    end
+    
+    it "creates a matrix of input shape with each entry linearly spaced in row major order" do
+      v = NMatrix.linspace(1, Math::PI, [2,2])
+      expect(v.dtype).to eq(:float64)
+
+      ans = [1.0, 1.7138642072677612, 2.4277284145355225, 3.1415927410125732]
+      
+      expect(v[0,0]).to be_within(0.000001).of(ans[0])
+      expect(v[0,1]).to be_within(0.000001).of(ans[1])
+      expect(v[1,0]).to be_within(0.000001).of(ans[2])
+      expect(v[1,1]).to be_within(0.000001).of(ans[3])
+    end
+  end
+
+  context "::logspace" do
+    it "creates a logarithmically spaced vector" do
+      v = NMatrix.logspace(1, 2, 10)
+      
+      expect(v.shape.length).to eq(1)
+      
+      #Unit test taken from Matlab R2015b output of logspace(1,2,10)
+      ans = [10.0000, 12.9155, 16.6810, 21.5443, 27.8256, 35.9381, 46.4159, 59.9484, 77.4264, 100.0000]
+      
+      expect(v[0].round(4)).to be_within(0.000001).of(ans[0])
+      expect(v[1].round(4)).to be_within(0.000001).of(ans[1])
+      expect(v[2].round(4)).to be_within(0.000001).of(ans[2])
+      expect(v[3].round(4)).to be_within(0.000001).of(ans[3])
+      expect(v[4].round(4)).to be_within(0.000001).of(ans[4])
+      expect(v[5].round(4)).to be_within(0.000001).of(ans[5])
+      expect(v[6].round(4)).to be_within(0.000001).of(ans[6])
+      expect(v[7].round(4)).to be_within(0.000001).of(ans[7])
+      expect(v[8].round(4)).to be_within(0.000001).of(ans[8])
+      expect(v[9].round(4)).to be_within(0.000001).of(ans[9])
+    end
+    
+    it "creates a logarithmically spaced vector bounded by Math::PI if :pi is pre-supplied" do
+      v = NMatrix.logspace(1, :pi, 7)
+                 
+      #Unit test taken from Matlab R2015b output of logspace(1,pi,10)
+      ans = [10.0000, 8.2450, 6.7980, 5.6050, 4.6213, 3.8103, 3.1416]
+      
+      expect(v[0].round(4)).to be_within(0.000001).of(ans[0])
+      expect(v[1].round(4)).to be_within(0.000001).of(ans[1])
+      expect(v[2].round(4)).to be_within(0.000001).of(ans[2])
+      expect(v[3].round(4)).to be_within(0.000001).of(ans[3])
+      expect(v[4].round(4)).to be_within(0.000001).of(ans[4])
+      expect(v[5].round(4)).to be_within(0.000001).of(ans[5])
+      expect(v[6].round(4)).to be_within(0.000001).of(ans[6])
+    end    
+
+    it "creates a matrix of input shape with each entry logarithmically spaced in row major order" do
+      v = NMatrix.logspace(1, 2, [3,2])
+      
+      ans = [10.0, 15.8489, 25.1189, 39.8107, 63.0957, 100.0]
+      
+      expect(v[0,0].round(4)).to be_within(0.000001).of(ans[0])
+      expect(v[0,1].round(4)).to be_within(0.000001).of(ans[1])
+      expect(v[1,0].round(4)).to be_within(0.000001).of(ans[2])
+      expect(v[1,1].round(4)).to be_within(0.000001).of(ans[3])
+      expect(v[2,0].round(4)).to be_within(0.000001).of(ans[4])
+      expect(v[2,1].round(4)).to be_within(0.000001).of(ans[5])
+    end
+  end
 
   it "seq() creates a matrix of integers, sequentially" do
     m = NMatrix.seq(2) # 2x2 matrix.
@@ -136,7 +277,6 @@ describe NMatrix do
     end
   end
 
-
   it "indgen() creates a matrix of integers as well as seq()" do
     m = NMatrix.indgen(2) # 2x2 matrix.
     value = 0
@@ -189,19 +329,19 @@ describe NMatrix do
   it "column() returns a NMatrix" do
     m = NMatrix.random(3)
 
-    expect(m.column(2).is_a?(NMatrix)).to be_true
+    expect(m.column(2).is_a?(NMatrix)).to be true
   end
 
   it "row() returns a NMatrix" do
     m = NMatrix.random(3)
 
-    expect(m.row(2).is_a?(NMatrix)).to be_true
+    expect(m.row(2).is_a?(NMatrix)).to be true
   end
 
   it "diagonals() creates an NMatrix" do
     arr = [1,2,3,4]
     m = NMatrix.diagonals(arr)
-    expect(m.is_a?(NMatrix)).to be_true
+    expect(m.is_a?(NMatrix)).to be true
   end
 
   it "diagonals() contains the seeded values on the diagonal" do

data/spec/spec_helper.rb

@@ -32,7 +32,7 @@ require "./lib/nmatrix/rspec"
 
 ALL_DTYPES = [:byte,:int8,:int16,:int32,:int64, :float32,:float64, :object,
   :complex64, :complex128]
-
+  
 NON_INTEGER_DTYPES = [:float32, :float64, :complex64, :complex128,
   :object]
 
@@ -48,6 +48,29 @@ COMPLEX_MATRIX32A_ARRAY = MATRIX32A_ARRAY.zip(MATRIX32A_ARRAY.reverse).collect {
 GETRF_EXAMPLE_ARRAY = [-1,0,10,4,9,2,3,5,7,8,1,6]
 GETRF_SOLUTION_ARRAY = [9.0, 2.0, 3.0, 5.0, 7.0/9, 58.0/9, -4.0/3, 19.0/9, -1.0/9, 1.0/29, 301.0/29, 130.0/29]
 
+TAU_SOLUTION_ARRAY = [1.8571428571428572,1.9938461538461538, 0.0]
+
+GEQRF_SOLUTION_ARRAY =[                -14.0,                -21.0, 14.000000000000002,
+                         0.23076923076923078,  -175.00000000000003,  70.00000000000001,
+                        -0.15384615384615385, 0.055555555555555546,              -35.0]
+
+R_SOLUTION_ARRAY   = [-159.2388143638353, -41.00131005172065, -56.75123892439876,  -90.75048729628048, 
+                                     0.0, 25.137473501580676,  2.073591725046292,   9.790607357775713, 
+                                     0.0,                0.0, -20.83259700334131, -17.592414929551445]
+
+Q_SOLUTION_ARRAY_1 = [-0.632455532033676, -0.5209522876558295, -0.3984263084135902,  -0.41214704991068,
+                    -0.42783756578748666, -0.20837937347171134, 0.876505919951498, 0.07259770177184455,
+                    -0.48364246567281094, 0.8265854747306287,-0.015758658987033422, -0.2873988222474053,
+                    -0.42783756578748666,  0.044081783789183565, -0.26971376257215296, 0.8615487797670971]
+
+Q_SOLUTION_ARRAY_2 = [-0.8571428571428572,   0.3942857142857143,  0.33142857142857146, 
+                      -0.4285714285714286,  -0.9028571428571428, -0.03428571428571425, 
+                       0.28571428571428575, -0.1714285714285714,   0.9428571428571428]
+
+Q_SOLUTION_ARRAY_3 = [-0.7724247413634004, -0.026670393594597247, -0.6345460653374136, 
+                      -0.5777485870360393,  -0.38541856437557026,  0.7194853024298236,
+                      -0.26375478973384403,   0.9223563413020934, 0.28229805268947933]
+
 def create_matrix(stype) #:nodoc:
   m = NMatrix.new([3,3], 0, dtype: :int32, stype: stype, default: 0)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nmatrix
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - John Woods
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packable
@@ -46,6 +46,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +177,7 @@ files:
 - ext/nmatrix/math/imax.h
 - ext/nmatrix/math/laswp.h
 - ext/nmatrix/math/long_dtype.h
+- ext/nmatrix/math/magnitude.h
 - ext/nmatrix/math/math.h
 - ext/nmatrix/math/nrm2.h
 - ext/nmatrix/math/rot.h
@@ -214,6 +229,7 @@ files:
 - lib/nmatrix/lapack_core.rb
 - lib/nmatrix/lapack_plugin.rb
 - lib/nmatrix/math.rb
+- lib/nmatrix/mkmf.rb
 - lib/nmatrix/monkeys.rb
 - lib/nmatrix/nmatrix.rb
 - lib/nmatrix/rspec.rb
@@ -249,7 +265,7 @@ files:
 - spec/utm5940.mtx
 homepage: http://sciruby.com
 licenses:
-- BSD 3-clause
+- BSD-3-Clause
 metadata: {}
 post_install_message: |
   ***********************************************************
@@ -289,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: NMatrix is a linear algebra library for Ruby