nmatrix 0.1.0.rc5 → 0.1.0

data/spec/blas_spec.rb

@@ -151,6 +151,10 @@ describe NMatrix::BLAS do
         expect(NMatrix::BLAS.asum(x)).to eq(10.0)
       end
 
+      it "exposes asum for single element" do
+        x = NMatrix.new([1], [-1], dtype: :float64)
+        expect(x.asum).to eq(1.0)
+      end
 
       it "exposes nrm2" do
         x = NMatrix.new([4,1], [2,-4,3,5], dtype: :float64)

data/spec/homogeneous_spec.rb

@@ -31,7 +31,7 @@ require "./lib/nmatrix/homogeneous.rb"
 require 'pry'
 
 describe 'NMatrix' do
-  context "#x_rotation" do
+  context ".x_rotation" do
     it "should generate a matrix representing a rotation about the x axis" do
       x = NMatrix.x_rotation(Math::PI.quo(6))
       expect(x).to be_within(1e-8).of(NMatrix.new([4,4], [1.0, 0.0, 0.0, 0.0,
@@ -42,7 +42,7 @@ describe 'NMatrix' do
   end
 
 
-  context "#y_rotation" do
+  context ".y_rotation" do
     it "should generate a matrix representing a rotation about the y axis" do
       y = NMatrix.y_rotation(Math::PI.quo(6))
       expect(y).to be_within(1e-8).of(NMatrix.new([4,4], [Math.cos(Math::PI.quo(6)), 0.0, 0.5, 0.0,
@@ -52,7 +52,7 @@ describe 'NMatrix' do
     end
   end
 
-  context "#z_rotation" do
+  context ".z_rotation" do
     it "should generate a matrix representing a rotation about the z axis" do
       z = NMatrix.z_rotation(Math::PI.quo(6))
       expect(z).to be_within(1e-8).of(NMatrix.new([4,4], [Math.cos(Math::PI.quo(6)), -0.5, 0.0, 0.0,
@@ -62,7 +62,7 @@ describe 'NMatrix' do
     end
   end
 
-  context "#translation" do
+  context ".translation" do
     it "should generate a translation matrix from an Array" do
       t = NMatrix.translation([4,5,6])
       expect(t).to be_within(1e-8).of(NMatrix.new([4,4], [1, 0, 0, 4,
@@ -88,4 +88,12 @@ describe 'NMatrix' do
       expect(t.dtype).to be(:float64)
     end
   end
+
+  context "#quaternion" do
+    it "should generate a singularity-free quaternion" do
+      transform = NMatrix.new([4,4], [-0.9995825,-0.02527934,-0.0139845,50.61761,-0.02732551,0.9844284,0.1736463,-22.95566,0.009376526,0.1739562,-0.9847089,7.1521,0,0,0,1])
+      q = transform.quaternion
+      expect(Math.sqrt(q[0]**2 + q[1]**2 + q[2]**2 + q[3]**2)).to be_within(1e-6).of(1.0)
+    end
+  end
 end

data/spec/io/fortran_format_spec.rb

@@ -0,0 +1,88 @@
+# = NMatrix
+#
+# A linear algebra library for scientific computation in Ruby.
+# NMatrix is part of SciRuby.
+#
+# NMatrix was originally inspired by and derived from NArray, by
+# Masahiro Tanaka: http://narray.rubyforge.org
+#
+# == Copyright Information
+#
+# SciRuby is Copyright (c) 2010 - 2014, Ruby Science Foundation
+# NMatrix is Copyright (c) 2012 - 2014, John Woods and the Ruby Science Foundation
+#
+# Please see LICENSE.txt for additional copyright notices.
+#
+# == Contributing
+#
+# By contributing source code to SciRuby, you agree to be bound by
+# our Contributor Agreement:
+#
+# * https://github.com/SciRuby/sciruby/wiki/Contributor-Agreement
+#
+# == fortran_format_spec.rb
+#
+# Basic tests for NMatrix::IO::FortranFormat.
+#
+
+require './lib/nmatrix'
+
+describe NMatrix::IO::FortranFormat do
+  it "parses integer FORTRAN formats" do
+    int_fmt =  NMatrix::IO::FortranFormat::Reader.new('(16I5)').parse
+
+    expect(int_fmt[:format_code]).to eq "INT_ID"
+    expect(int_fmt[:repeat])     .to eq 16
+    expect(int_fmt[:field_width]).to eq 5    
+
+    int_fmt = NMatrix::IO::FortranFormat::Reader.new('(I4)').parse 
+
+    expect(int_fmt[:format_code]).to eq "INT_ID"
+    expect(int_fmt[:field_width]).to eq 4
+  end
+
+  it "parses floating point FORTRAN formats" do
+    fp_fmt = NMatrix::IO::FortranFormat::Reader.new('(10F7.1)').parse
+
+    expect(fp_fmt[:format_code])       .to eq "FP_ID"
+    expect(fp_fmt[:repeat])            .to eq 10
+    expect(fp_fmt[:field_width])       .to eq 7
+    expect(fp_fmt[:post_decimal_width]).to eq 1
+
+    fp_fmt = NMatrix::IO::FortranFormat::Reader.new('(F4.2)').parse
+
+    expect(fp_fmt[:format_code])       .to eq "FP_ID"
+    expect(fp_fmt[:field_width])       .to eq 4
+    expect(fp_fmt[:post_decimal_width]).to eq 2
+  end
+
+  it "parses exponential FORTRAN formats" do
+    exp_fmt = NMatrix::IO::FortranFormat::Reader.new('(2E8.3E3)').parse
+
+    expect(exp_fmt[:format_code])       .to eq "EXP_ID"
+    expect(exp_fmt[:repeat])            .to eq 2
+    expect(exp_fmt[:field_width])       .to eq 8
+    expect(exp_fmt[:post_decimal_width]).to eq 3
+    expect(exp_fmt[:exponent_width])    .to eq 3
+
+    exp_fmt = NMatrix::IO::FortranFormat::Reader.new('(3E3.6)').parse
+
+    expect(exp_fmt[:format_code])       .to eq "EXP_ID"
+    expect(exp_fmt[:repeat])            .to eq 3
+    expect(exp_fmt[:field_width])       .to eq 3
+    expect(exp_fmt[:post_decimal_width]).to eq 6
+
+    exp_fmt = NMatrix::IO::FortranFormat::Reader.new('(E4.5)').parse
+    expect(exp_fmt[:format_code])       .to eq "EXP_ID"
+    expect(exp_fmt[:field_width])       .to eq 4
+    expect(exp_fmt[:post_decimal_width]).to eq 5
+  end
+
+  ['I3', '(F4)', '(E3.', '(E4.E5)'].each do |bad_format|
+    it "doesn't let bad input through : #{bad_format}" do
+      expect {
+        NMatrix::IO::FortranFormat::Reader.new(bad_format).parse
+      }.to raise_error(IOError)
+  end
+end
+end

data/spec/io/harwell_boeing_spec.rb

@@ -0,0 +1,98 @@
+# = NMatrix
+#
+# A linear algebra library for scientific computation in Ruby.
+# NMatrix is part of SciRuby.
+#
+# NMatrix was originally inspired by and derived from NArray, by
+# Masahiro Tanaka: http://narray.rubyforge.org
+#
+# == Copyright Information
+#
+# SciRuby is Copyright (c) 2010 - 2014, Ruby Science Foundation
+# NMatrix is Copyright (c) 2012 - 2014, John Woods and the Ruby Science Foundation
+#
+# Please see LICENSE.txt for additional copyright notices.
+#
+# == Contributing
+#
+# By contributing source code to SciRuby, you agree to be bound by
+# our Contributor Agreement:
+#
+# * https://github.com/SciRuby/sciruby/wiki/Contributor-Agreement
+#
+# == io_spec.rb
+#
+# Basic tests for NMatrix::IO::HarwelBoeing.
+
+# TODO : After the fortran format thing is done
+require 'spec_helper'
+require "./lib/nmatrix"
+
+describe NMatrix::IO::HarwellBoeing do
+  def check_file_header header
+    expect(header[:title])    .to eq("Title")
+    expect(header[:key])      .to eq("Key")
+
+    expect(header[:totcrd])   .to eq(5)
+    expect(header[:ptrcrd])   .to eq(1)
+    expect(header[:indcrd])   .to eq(1)
+    expect(header[:valcrd])   .to eq(3)
+    expect(header[:rhscrd])   .to eq(0)
+    
+    expect(header[:mxtype])   .to eq('RUA')
+    expect(header[:nrow])     .to eq(5)
+    expect(header[:ncol])     .to eq(5)
+    expect(header[:nnzero])   .to eq(13)
+    expect(header[:neltvl])   .to eq(0)
+
+    expect(header[:ptrfmt])   .to eq({
+      format_code: "INT_ID",
+      repeat:             6,         
+      field_width:        3
+      })
+    expect(header[:indfmt])   .to eq({
+      format_code: "INT_ID",
+      repeat:            13,
+      field_width:       3
+      })
+    expect(header[:valfmt])   .to eq({
+      format_code:         "EXP_ID",
+      repeat:                     5,
+      field_width:               15,
+      post_decimal_width:         8
+      })
+    expect(header[:rhsfmt])   .to eq({
+      format_code:         "EXP_ID",
+      repeat:                     5,
+      field_width:               15,
+      post_decimal_width:         8
+      })
+  end
+
+  it "loads a Harwell Boeing file values and header (currently real only)" do
+    n, h = NMatrix::IO::HarwellBoeing.load("spec/io/test.rua")
+
+    expect(n.is_a? NMatrix).to eq(true)
+    expect(n.cols)         .to eq(5)
+    expect(n.rows)         .to eq(5)
+
+    expect(n[0,0])         .to eq(11)
+    expect(n[4,4])         .to eq(55)
+
+    expect(h.is_a? Hash).to eq(true) 
+    check_file_header(h)
+  end
+
+  it "loads only the header of the file when specified" do
+    h = NMatrix::IO::HarwellBoeing.load("spec/io/test.rua", header: true)
+
+    expect(h.is_a? Hash).to eq(true)
+    check_file_header(h)
+  end
+
+  it "raises error for wrong Harwell Boeing file name" do
+    expect{
+      NMatrix::IO::HarwellBoeing.load("spec/io/wrong.afx")
+    }.to raise_error(IOError)
+  end
+end

data/spec/io/test.rua

@@ -0,0 +1,9 @@
+Title                                                                   Key     
+             5             1             1             3             0
+RUA                        5             5            13             0
+(6I3)           (13I3)          (5E15.8)            (5E15.8)            
+  1  4  7  8 11 14
+  1  3  5  2  3  5  3  1  3  4  3  4  5
+11.0           31.0           51.0           22.0           32.0
+52.0           33.0           14.0           34.0           44.0
+35.0           45.0           55.0

data/spec/math_spec.rb

@@ -28,6 +28,9 @@
 
 require 'spec_helper'
 
+ALL_DTYPES = [:byte,:int8,:int16,:int32,:int64, :float32,:float64, :object,
+  :rational32,:rational64,:rational128, :complex64, :complex128]
+
 describe "math" do
   context "elementwise math functions" do
 
@@ -124,7 +127,7 @@ describe "math" do
         context "Floor and ceil for #{stype}" do  
 
           [:floor, :ceil].each do |meth|
-            [:byte,:int8,:int16,:int32,:int64, :float32,:float64, :object,:rational32,:rational64,:rational128, :complex64, :complex128].each do |dtype|
+            ALL_DTYPES.each do |dtype|
               context dtype do
                 before :each do
                   @size = [2,2]
@@ -163,6 +166,30 @@ describe "math" do
             end
           end
         end
+
+        context "#round for #{stype}" do
+          ALL_DTYPES.each do |dtype|
+            context dtype do
+              before :each do
+                @size = [2,2]
+                @mat  = NMatrix.new @size, [1.33334, 0.9998, 1.9999, -8.9999], 
+                  dtype: dtype, stype: stype
+                @ans  = @mat.to_a.flatten
+              end
+
+              it "rounds #{dtype} for #{stype}" do
+                expect(@mat.round).to eq(N.new(@size, @ans.map { |a| a.round}, 
+                  dtype: dtype, stype: stype))
+              end unless(/complex/ =~ dtype)
+
+              it "rounds complex dtype #{dtype} for #{stype}" do
+                
+                expect(@mat.round).to eq(N.new [2,2], @ans.map {|a| 
+                  Complex(a.real.round, a.imag.round)},dtype: dtype, stype: stype)
+              end if(/complex/ =~ dtype)
+            end
+          end
+        end
         
       end
     end
@@ -184,9 +211,9 @@ describe "math" do
     end
 
     context dtype do
-      it "should correctly invert a matrix in place" do
-        a = NMatrix.new(:dense, 3, [1,0,4,1,1,6,-3,0,-10], dtype)
-        b = NMatrix.new(:dense, 3, [-5,0,-2,-4,1,-1,3.quo(2),0,1.quo(2)], dtype)
+      it "should correctly invert a matrix in place (bang)", :focus => true do
+        a = NMatrix.new(:dense, 3, [1,2,3,0,1,4,5,6,0], dtype)
+        b = NMatrix.new(:dense, 3, [-24,18,5,20,-15,-4,-5,4,1], dtype)
         begin
           a.invert!
         rescue NotImplementedError => e
@@ -196,16 +223,31 @@ describe "math" do
             pending e.to_s
           end
         end
-        expect(a).to eq(b)
+        expect(a.round).to eq(b)
       end
 
       unless NMatrix.has_clapack?
-        it "should correctly exact-invert a matrix" do
-          a = NMatrix.new(:dense, 3, [1,0,4,1,1,6,-3,0,-10], dtype)
-          b = NMatrix.new(:dense, 3, [-5,0,-2,-4,1,-1,3.quo(2),0,1.quo(2)], dtype)
-          a.invert.should == b
+        it "should correctly invert a matrix in place" do
+          a = NMatrix.new(:dense, 5, [1, 8,-9, 7, 5, 
+                                      0, 1, 0, 4, 4, 
+                                      0, 0, 1, 2, 5, 
+                                      0, 0, 0, 1,-5,
+                                      0, 0, 0, 0, 1 ], dtype)
+          b = NMatrix.new(:dense, 5, [1,-8, 9, 7, 17,
+                                      0, 1, 0,-4,-24,
+                                      0, 0, 1,-2,-15,
+                                      0, 0, 0, 1,  5,
+                                      0, 0, 0, 0,  1,], dtype)
+          expect(a.invert).to eq(b)
         end
       end
+
+      it "should correctly invert a matrix out-of-place" do
+        a = NMatrix.new(:dense, 3, [1,2,3,0,1,4,5,6,0], dtype)
+        b = NMatrix.new(:dense, 3, [-24,18,5,20,-15,-4,-5,4,1], dtype)
+
+        expect(a.invert(3,3)).to eq(b)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nmatrix
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc5
+  version: 0.1.0
 platform: ruby
 authors:
 - John Woods
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -32,6 +32,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
+- !ruby/object:Gem::Dependency
+  name: packable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,8 +136,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: NMatrix is an experimental linear algebra library for Ruby, written mostly
-  in C.
+description: NMatrix is a linear algebra library for Ruby, written mostly in C and
+  C++.
 email:
 - john.o.woods@gmail.com
 executables: []
@@ -202,6 +222,8 @@ files:
 - lib/nmatrix/blas.rb
 - lib/nmatrix/enumerate.rb
 - lib/nmatrix/homogeneous.rb
+- lib/nmatrix/io/fortran_format.rb
+- lib/nmatrix/io/harwell_boeing.rb
 - lib/nmatrix/io/market.rb
 - lib/nmatrix/io/mat5_reader.rb
 - lib/nmatrix/io/mat_reader.rb
@@ -220,12 +242,16 @@ files:
 - spec/00_nmatrix_spec.rb
 - spec/01_enum_spec.rb
 - spec/02_slice_spec.rb
+- spec/03_nmatrix_monkeys_spec.rb
 - spec/2x2_dense_double.mat
 - spec/4x4_sparse.mat
 - spec/4x5_dense.mat
 - spec/blas_spec.rb
 - spec/elementwise_spec.rb
 - spec/homogeneous_spec.rb
+- spec/io/fortran_format_spec.rb
+- spec/io/harwell_boeing_spec.rb
+- spec/io/test.rua
 - spec/io_spec.rb
 - spec/lapack_spec.rb
 - spec/leakcheck.rb
@@ -242,7 +268,7 @@ files:
 - spec/utm5940.mtx
 homepage: http://sciruby.com
 licenses:
-- BSD 2-clause
+- BSD 3-clause
 metadata: {}
 post_install_message: |
   ***********************************************************
@@ -275,26 +301,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: NMatrix is an experimental linear algebra library for Ruby, written mostly
-  in C.
+summary: NMatrix is a linear algebra library for Ruby
 test_files:
 - spec/00_nmatrix_spec.rb
 - spec/01_enum_spec.rb
 - spec/02_slice_spec.rb
+- spec/03_nmatrix_monkeys_spec.rb
 - spec/2x2_dense_double.mat
 - spec/4x4_sparse.mat
 - spec/4x5_dense.mat
 - spec/blas_spec.rb
 - spec/elementwise_spec.rb
 - spec/homogeneous_spec.rb
+- spec/io/fortran_format_spec.rb
+- spec/io/harwell_boeing_spec.rb
+- spec/io/test.rua
 - spec/io_spec.rb
 - spec/lapack_spec.rb
 - spec/leakcheck.rb