nmatrix 0.0.2 → 0.0.3

data/spec/nmatrix_yale_spec.rb

@@ -27,19 +27,20 @@
 require "./lib/nmatrix"
 
 describe NMatrix do
+  context :yale do
   it "calculates itype" do
     NMatrix.itype_by_shape([4,4]).should == :uint8
     NMatrix.itype_by_shape(4).should == :uint8
     ## FIXME: Check larger shapes for correct itype
   end
 
-  it "compares two empty yale matrices" do
+  it "compares two empty matrices" do
     n = NMatrix.new(:yale, [4,4], :float64)
     m = NMatrix.new(:yale, [4,4], :float64)
     n.should == m
   end
 
-  it "compares two yale matrices following basic assignments" do
+  it "compares two matrices following basic assignments" do
     n = NMatrix.new(:yale, [2,2], :float64)
     m = NMatrix.new(:yale, [2,2], :float64)
     m[0,0] = 1
@@ -51,7 +52,7 @@ describe NMatrix do
     n.should == m
   end
 
-  it "compares two yale matrices following elementwise operations" do
+  it "compares two matrices following elementwise operations" do
     n = NMatrix.new(:yale, [2,2], :float64)
     n[0,1] = 1
     m = NMatrix.new(:yale, [2,2], :float64)
@@ -61,7 +62,7 @@ describe NMatrix do
     (n+m).should == r
   end
 
-  it "sets diagonal values in yale" do
+  it "sets diagonal values" do
     n = NMatrix.new(:yale, [2,3], :float64)
     n.extend(NMatrix::YaleFunctions)
     n[1,1] = 0.1
@@ -69,7 +70,7 @@ describe NMatrix do
     n.yale_d.should == [0.2, 0.1]
   end
 
-  it "does not resize yale until necessary" do
+  it "does not resize until necessary" do
     n = NMatrix.new(:yale, [2,3], :float64)
     n.extend(NMatrix::YaleFunctions)
     n.yale_size.should == 3
@@ -82,7 +83,7 @@ describe NMatrix do
   end
 
 
-  it "sets when not resizing (yale)" do
+  it "sets when not resizing" do
     n = NMatrix.new(:yale, [2,3], :float64)
     n.extend(NMatrix::YaleFunctions)
     n[0,0] = 0.1
@@ -92,7 +93,7 @@ describe NMatrix do
     n.yale_ija == [3,4,5,1,0]
   end
 
-  it "sets when resizing (yale)" do
+  it "sets when resizing" do
     n = NMatrix.new(:yale, [2,3], :float64)
     n.extend(NMatrix::YaleFunctions)
     n[0,0] = 0.01
@@ -106,7 +107,7 @@ describe NMatrix do
     n.yale_lu.should == [0.2, 0.3, 0.4, nil]
   end
 
-  it "sets values within rows of yale" do
+  it "sets values within rows" do
     n = NMatrix.new(:yale, [3,20], :float64)
     n.extend(NMatrix::YaleFunctions)
     n[2,1]   = 1.0
@@ -116,7 +117,7 @@ describe NMatrix do
     n.yale_ja.should == [0, 1, 15]
   end
 
-  it "gets values within rows of yale" do
+  it "gets values within rows" do
     n = NMatrix.new(:yale, [3,20], :float64)
     n[2,1]   = 1.0
     n[2,0]   = 1.5
@@ -126,7 +127,7 @@ describe NMatrix do
     n[2,15].should == 2.0
   end
 
-  it "sets values within large rows of yale" do
+  it "sets values within large rows" do
     n = NMatrix.new(:yale, [10,300], :float64)
     n.extend(NMatrix::YaleFunctions)
     n[5,1]   = 1.0
@@ -143,7 +144,7 @@ describe NMatrix do
     n.yale_ja.should == [0,   1,   15,  100, 289, 290, 291, 292, 293, 299]
   end
 
-  it "gets values within large rows of yale" do
+  it "gets values within large rows" do
     n = NMatrix.new(:yale, [10,300], :float64)
     n.extend(NMatrix::YaleFunctions)
     n[5,1]   = 1.0
@@ -163,7 +164,7 @@ describe NMatrix do
     end
   end
 
-  it "dots two identical yale matrices" do
+  it "dots two identical matrices" do
     a = NMatrix.new(:yale, 4, :float64)
     a[0,1] = 4.0
     a[1,2] = 1.0
@@ -191,7 +192,7 @@ describe NMatrix do
     c[3,3].should == 2.0
   end
 
-  it "dots two identical yale matrices where a positive and negative partial sum cancel on the diagonal" do
+  it "dots two identical matrices where a positive and negative partial sum cancel on the diagonal" do
     a = NMatrix.new(:yale, 4, :float64)
 
     a[0,0] = 1.0
@@ -228,7 +229,7 @@ describe NMatrix do
 
   end
 
-  it "transposes yale" do
+  it "transposes" do
     a = NMatrix.new(:yale, 4, :float64)
     a[0,0] = 1.0
     a[0,1] = 4.0
@@ -252,4 +253,5 @@ describe NMatrix do
     b[3,3].should == 6.0
   end
 
-end
+  end
+end

data/spec/shortcuts_spec.rb

@@ -0,0 +1,154 @@
+# = 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 - 2012, Ruby Science Foundation
+# NMatrix is Copyright (c) 2012, 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
+#
+# == shortcuts_spec.rb
+#
+# Specs for the shortcuts used in NMatrix and in NVector.
+#
+
+# Can we use require_relative here instead?
+require File.join(File.dirname(__FILE__), "spec_helper.rb")
+
+describe NMatrix do
+    
+  it "zeros() creates a matrix of zeros" do
+    m = NMatrix.zeros(3)
+    n = NMatrix.new([3, 3], 0)
+    
+    m.should.eql? n
+  end
+  
+  it "ones() creates a matrix of ones" do
+    m = NMatrix.ones(3)
+    n = NMatrix.new([3, 3], 1)
+    
+    m.should.eql? n    
+  end
+  
+  it "eye() creates an identity matrix" do
+    m = NMatrix.eye(3)
+    identity3 = NMatrix.new([3, 3], [1, 0, 0, 0, 1, 0, 0, 0, 1])
+    
+    m.should.eql? identity3
+  end
+  
+  it "random() creates a matrix of random numbers" do
+    m = NMatrix.random(2)
+    
+    m.stype.should == :dense
+    m.dtype.should == :float64
+  end
+  
+  it "seq() creates a matrix of integers, sequentially" do
+    m = NMatrix.seq(2) # 2x2 matrix.
+    value = 0
+    
+    2.times do |i|
+      2.times do |j|
+        m[i, j].should == value
+        value += 1
+      end
+    end
+  end
+  
+  it "seq() only accepts an integer or a 2-element array as dimension" do
+    expect { NMatrix.seq([1, 2, 3]) }.to raise_error
+    expect { NMatrix.seq("not an array or integer") }.to raise_error
+  end
+  
+  it "column() returns a NMatrix" do
+    m = NMatrix.random(3)
+    
+    m.column(2).is_a?(NMatrix).should be_true
+  end
+  
+  it "column() accepts a second parameter (only :copy or :reference)" do
+    m = NMatrix.random(3)
+    
+    expect { m.column(1, :copy) }.to_not raise_error
+    expect { m.column(1, :reference) }.to_not raise_error
+    
+    expect { m.column(1, :derp) }.to raise_error
+  end
+end
+
+describe "NVector" do
+      
+  it "zeros() creates a vector of zeros" do
+    v = NVector.zeros(4)
+    
+    4.times do |i|
+      v[i].should == 0
+    end
+  end
+  
+  it "ones() creates a vector of ones" do
+    v = NVector.ones(3)
+    
+    3.times do |i|
+      v[i].should == 1
+    end
+  end
+  
+  it "random() creates a vector of random numbers" do
+    v = NVector.zeros(4)
+    v.dtype.should == :float64
+    v.stype.should == :dense
+  end
+  
+  it "seq() creates a vector of integers, sequentially" do
+    v = NVector.seq(7)
+    i = 0
+    
+    v.each do |elem|
+      elem.should == i
+      i += 1
+    end
+  end
+  
+  it "seq() only accepts integers as dimension" do
+    expect { NVector.seq(3) }.to_not raise_error
+
+    expect { NVector.seq([1, 3]) }.to raise_error
+    expect { NVector.seq(:wtf) }.to raise_error
+  end
+  
+  it "linspace() creates a vector with n values equally spaced between a and b" do
+    v = NVector.linspace(0, 2, 5)
+    i = 0
+    
+    v.each do |elem|
+      elem.should == i * 0.5
+      i += 1
+    end
+  end  
+end
+
+describe "Inline constructor" do
+  
+  it "creates a NMatrix with the given values" do
+    m = NMatrix.new([2, 2], [1, 4, 6, 7])
+    n = N[[1, 4], [6, 7]]
+    
+    m.should.eql? n 
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nmatrix
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &75615060 !ruby/object:Gem::Requirement
+  requirement: &78366730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *75615060
+  version_requirements: *78366730
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &75614870 !ruby/object:Gem::Requirement
+  requirement: &78366510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75614870
+  version_requirements: *78366510
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75614590 !ruby/object:Gem::Requirement
+  requirement: &78366230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *75614590
+  version_requirements: *78366230
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &75614320 !ruby/object:Gem::Requirement
+  requirement: &78365970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *75614320
+  version_requirements: *78365970
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &75614020 !ruby/object:Gem::Requirement
+  requirement: &78365710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *75614020
+  version_requirements: *78365710
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &75613790 !ruby/object:Gem::Requirement
+  requirement: &78365470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,7 +78,7 @@ dependencies:
         version: 0.8.1
   type: :development
   prerelease: false
-  version_requirements: *75613790
+  version_requirements: *78365470
 description: NMatrix is an experimental linear algebra library for Ruby, written mostly
   in C.
 email:
@@ -97,6 +97,7 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- ext/nmatrix/binary_format.txt
 - ext/nmatrix/data/complex.h
 - ext/nmatrix/data/data.cpp
 - ext/nmatrix/data/data.h
@@ -130,14 +131,18 @@ files:
 - ext/nmatrix/util/util.h
 - lib/nmatrix.rb
 - lib/nmatrix/blas.rb
+- lib/nmatrix/io/market.rb
 - lib/nmatrix/io/mat5_reader.rb
 - lib/nmatrix/io/mat_reader.rb
+- lib/nmatrix/lapack.rb
 - lib/nmatrix/monkeys.rb
 - lib/nmatrix/nmatrix.rb
 - lib/nmatrix/nvector.rb
+- lib/nmatrix/shortcuts.rb
 - lib/nmatrix/version.rb
 - nmatrix.gemspec
 - scripts/mac-brew-gcc.sh
+- spec/2x2_dense_double.mat
 - spec/4x4_sparse.mat
 - spec/4x5_dense.mat
 - spec/blas_spec.rb
@@ -145,9 +150,11 @@ files:
 - spec/io_spec.rb
 - spec/lapack_spec.rb
 - spec/math_spec.rb
+- spec/nmatrix_list_spec.rb
 - spec/nmatrix_spec.rb
 - spec/nmatrix_yale_spec.rb
 - spec/nvector_spec.rb
+- spec/shortcuts_spec.rb
 - spec/slice_spec.rb
 - spec/spec_helper.rb
 - spec/utm5940.mtx
@@ -181,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1003602253
+      hash: -1012108815
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10