nmatrix 0.0.5 → 0.0.6

data/spec/nmatrix_yale_spec.rb

@@ -57,9 +57,7 @@ describe NMatrix do
       n[0,1] = 1
       m = NMatrix.new(:yale, [2,2], :float64)
       m[0,1] = -1
-      r = NMatrix.new(:yale, [2,2], :float64)
-      r[0,1] = 0
-      (n+m).should == r
+      (n+m).should == NMatrix.new(:yale, [2,2], :float64)
     end
 
     it "sets diagonal values" do

data/spec/shortcuts_spec.rb

@@ -51,6 +51,21 @@ describe NMatrix do
     m.should.eql? identity3
   end
 
+  it "diag() creates a matrix with pre-supplied diagonal" do
+    arr = [1,2,3,4]
+    m = NMatrix.diag(arr)
+    m.is_a?(NMatrix).should be_true
+  end
+
+  it "diagonals() contains the seeded values on the diagonal" do
+    arr = [1,2,3,4]
+    m = NMatrix.diagonals(arr)
+    m[0,0].should eq(arr[0])
+    m[1,1].should eq(arr[1])
+    m[2,2].should eq(arr[2])
+    m[3,3].should eq(arr[3])
+  end
+
   it "random() creates a matrix of random numbers" do
     m = NMatrix.random(2)
 
@@ -201,12 +216,7 @@ describe "NVector" do
 
   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
+    v.should == NVector.new(7, [0, 1, 2, 3, 4, 5, 6], :int64)
   end
 
   it "seq() only accepts integers as dimension" do
@@ -218,52 +228,32 @@ describe "NVector" do
 
   it "indgen() creates a vector of integers as well as seq()" do
     v = NVector.indgen(7)
-    i = 0
-
-    v.each do |elem|
-      elem.should == i
-      i += 1
-    end
+    v.should == NVector.new(7, [0, 1, 2, 3, 4, 5, 6], :int64)
   end
 
   it "findgen creates a vector of floats, sequentially" do
     v = NVector.findgen(2)
-
-    2.times do |i|
-      (v[i]/10).should be_within(Float::EPSILON).of(i.to_f/10)
-    end
+    v.should == NVector.new(2, [0.0, 1.0], :float32)
   end
 
   it "bindgen() creates a vector of bytes, sequentially" do
-    v = NVector.bindgen(7)
-    i = 0
-
-    v.each do |elem|
-      elem.should == i
-      i += 1
-    end
+    v = NVector.bindgen(4)
+    v.should == NVector.new(4, [0, 1, 2, 3], :byte)
   end
 
   it "cindgen() creates a vector of complexes, sequentially" do
     v = NVector.cindgen(2)
-    value = 0
-
-    2.times do |i|
-      v[i].real.should be_within(Float::EPSILON).of(value)
-      v[i].imag.should be_within(Float::EPSILON).of(0.0)
-      value += 1
-    end
+    v.should == NVector.new(2, [Complex(0.0, 0.0), Complex(1.0, 0.0)], :complex64)
   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.should == NVector.new(5, [0, 0.5, 1.0, 1.5, 2.0], :float64)
+  end
 
-    v.each do |elem|
-      elem.should == i * 0.5
-      i += 1
-    end
+  it "logspace() creates a vector with n values logarithmically spaced between decades 10^a and 10^b" do
+    v = NVector.logspace(0, 3, 4)
+    v.should == NVector.new(4, [1, 10, 100, 1000], :float64)
   end
 end
 

data/spec/slice_spec.rb

@@ -157,8 +157,6 @@ describe "Slice operation" do
             @m[0,1].should eql(-9)
           end
 
-          it 'should set value from NMatrix'
-
           it 'should slice again' do
             n = @m[1..2, 1..2]
             nm_eql(n[1,0..1], NVector.new(2, [7,8], :int32).transpose).should be_true
@@ -224,11 +222,11 @@ describe "Slice operation" do
                 (N[[0,0,0]] + @m[1,0..2]).should eq N[[3, 4, 5]]
               end
 
-              it "scalar adds to slices" do 
+              it "scalar adds to slices" do
                 (@m[1,0..2]+1).should eq N[[4, 5, 6]]
               end
 
-              it "compares slices to scalars" do 
+              it "compares slices to scalars" do
                 (@m[1, 0..2] > 2).each { |e| (e != 0).should be_true }
               end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nmatrix
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - John Woods
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc