nmatrix 0.0.3 → 0.0.4

data/spec/nmatrix_yale_spec.rb

@@ -28,230 +28,246 @@ 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 "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 matrices" do
-    n = NMatrix.new(:yale, [4,4], :float64)
-    m = NMatrix.new(:yale, [4,4], :float64)
-    n.should == m
-  end
+    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 matrices following basic assignments" do
-    n = NMatrix.new(:yale, [2,2], :float64)
-    m = NMatrix.new(:yale, [2,2], :float64)
-    m[0,0] = 1
-    m[0,1] = 1
-    n.should_not == m
-    n[0,0] = 1
-    n.should_not == m
-    n[0,1] = 1
-    n.should == m
-  end
+    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
+      m[0,1] = 1
+      n.should_not == m
+      n[0,0] = 1
+      n.should_not == m
+      n[0,1] = 1
+      n.should == m
+    end
 
-  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)
-    m[0,1] = -1
-    r = NMatrix.new(:yale, [2,2], :float64)
-    r[0,1] = 0
-    (n+m).should == r
-  end
+    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)
+      m[0,1] = -1
+      r = NMatrix.new(:yale, [2,2], :float64)
+      r[0,1] = 0
+      (n+m).should == r
+    end
 
-  it "sets diagonal values" do
-    n = NMatrix.new(:yale, [2,3], :float64)
-    n.extend(NMatrix::YaleFunctions)
-    n[1,1] = 0.1
-    n[0,0] = 0.2
-    n.yale_d.should == [0.2, 0.1]
-  end
+    it "sets diagonal values" do
+      n = NMatrix.new(:yale, [2,3], :float64)
+      n.extend(NMatrix::YaleFunctions)
+      n[1,1] = 0.1
+      n[0,0] = 0.2
+      n.yale_d.should == [0.2, 0.1]
+    end
 
-  it "does not resize until necessary" do
-    n = NMatrix.new(:yale, [2,3], :float64)
-    n.extend(NMatrix::YaleFunctions)
-    n.yale_size.should == 3
-    n.capacity.should == 5
-    n[0,0] = 0.1
-    n[0,1] = 0.2
-    n[1,0] = 0.3
-    n.yale_size.should == 5
-    n.capacity.should == 5
-  end
+    it "does not resize until necessary" do
+      n = NMatrix.new(:yale, [2,3], :float64)
+      n.extend(NMatrix::YaleFunctions)
+      n.yale_size.should == 3
+      n.capacity.should == 5
+      n[0,0] = 0.1
+      n[0,1] = 0.2
+      n[1,0] = 0.3
+      n.yale_size.should == 5
+      n.capacity.should == 5
+    end
 
 
-  it "sets when not resizing" do
-    n = NMatrix.new(:yale, [2,3], :float64)
-    n.extend(NMatrix::YaleFunctions)
-    n[0,0] = 0.1
-    n[0,1] = 0.2
-    n[1,0] = 0.3
-    n.yale_a == [0.1, 0.0, 0.0, 0.2, 0.3]
-    n.yale_ija == [3,4,5,1,0]
-  end
+    it "sets when not resizing" do
+      n = NMatrix.new(:yale, [2,3], :float64)
+      n.extend(NMatrix::YaleFunctions)
+      n[0,0] = 0.1
+      n[0,1] = 0.2
+      n[1,0] = 0.3
+      n.yale_a == [0.1, 0.0, 0.0, 0.2, 0.3]
+      n.yale_ija == [3,4,5,1,0]
+    end
 
-  it "sets when resizing" do
-    n = NMatrix.new(:yale, [2,3], :float64)
-    n.extend(NMatrix::YaleFunctions)
-    n[0,0] = 0.01
-    n[1,1] = 0.1
-    n[0,1] = 0.2
-    n[1,0] = 0.3
-    n[1,2] = 0.4
-    n.yale_d.should == [0.01, 0.1]
-    n.yale_ia.should == [3,4,6]
-    n.yale_ja.should == [1,0,2,nil]
-    n.yale_lu.should == [0.2, 0.3, 0.4, nil]
-  end
+    it "sets when resizing" do
+      n = NMatrix.new(:yale, [2,3], :float64)
+      n.extend(NMatrix::YaleFunctions)
+      n[0,0] = 0.01
+      n[1,1] = 0.1
+      n[0,1] = 0.2
+      n[1,0] = 0.3
+      n[1,2] = 0.4
+      n.yale_d.should == [0.01, 0.1]
+      n.yale_ia.should == [3,4,6]
+      n.yale_ja.should == [1,0,2,nil]
+      n.yale_lu.should == [0.2, 0.3, 0.4, nil]
+    end
 
-  it "sets values within rows" do
-    n = NMatrix.new(:yale, [3,20], :float64)
-    n.extend(NMatrix::YaleFunctions)
-    n[2,1]   = 1.0
-    n[2,0]   = 1.5
-    n[2,15]  = 2.0
-    n.yale_lu.should == [1.5, 1.0, 2.0]
-    n.yale_ja.should == [0, 1, 15]
-  end
+    it "resizes without erasing values" do
+      require 'yaml'
 
-  it "gets values within rows" do
-    n = NMatrix.new(:yale, [3,20], :float64)
-    n[2,1]   = 1.0
-    n[2,0]   = 1.5
-    n[2,15]  = 2.0
-    n[2,1].should == 1.0
-    n[2,0].should == 1.5
-    n[2,15].should == 2.0
-  end
+      associations = File.open('spec/nmatrix_yale_resize_test_associations.yaml') { |y| YAML::load(y) }
 
-  it "sets values within large rows" do
-    n = NMatrix.new(:yale, [10,300], :float64)
-    n.extend(NMatrix::YaleFunctions)
-    n[5,1]   = 1.0
-    n[5,0]   = 1.5
-    n[5,15]  = 2.0
-    n[5,291] = 3.0
-    n[5,292] = 4.0
-    n[5,289] = 5.0
-    n[5,290] = 6.0
-    n[5,293] = 2.0
-    n[5,299] = 7.0
-    n[5,100] = 8.0
-    n.yale_lu.should == [1.5, 1.0, 2.0, 8.0, 5.0, 6.0, 3.0, 4.0, 2.0, 7.0]
-    n.yale_ja.should == [0,   1,   15,  100, 289, 290, 291, 292, 293, 299]
-  end
+      n = NMatrix.new(:yale, [618, 2801], associations.size, :byte)
 
-  it "gets values within large rows" do
-    n = NMatrix.new(:yale, [10,300], :float64)
-    n.extend(NMatrix::YaleFunctions)
-    n[5,1]   = 1.0
-    n[5,0]   = 1.5
-    n[5,15]  = 2.0
-    n[5,291] = 3.0
-    n[5,292] = 4.0
-    n[5,289] = 5.0
-    n[5,290] = 6.0
-    n[5,293] = 2.0
-    n[5,299] = 7.0
-    n[5,100] = 8.0
+      associations.each_pair do |j,i|
+        n[i,j] = 1
+        n[i,j].should be(1), "Value at #{i},#{j} not inserted correctly!"
+      end
 
-    n.yale_ja.each_index do |idx|
-      j = n.yale_ja[idx]
-      n[5,j].should == n.yale_lu[idx]
+      associations.each_pair do |j,i|
+        n[i,j].should be(1), "Value at #{i},#{j} erased during resize!"
+      end
     end
-  end
 
-  it "dots two identical matrices" do
-    a = NMatrix.new(:yale, 4, :float64)
-    a[0,1] = 4.0
-    a[1,2] = 1.0
-    a[1,3] = 1.0
-    a[3,1] = 2.0
+    it "sets values within rows" do
+      n = NMatrix.new(:yale, [3,20], :float64)
+      n.extend(NMatrix::YaleFunctions)
+      n[2,1]   = 1.0
+      n[2,0]   = 1.5
+      n[2,15]  = 2.0
+      n.yale_lu.should == [1.5, 1.0, 2.0]
+      n.yale_ja.should == [0, 1, 15]
+    end
 
-    b = a.dup
-    c = a.dot b
+    it "gets values within rows" do
+      n = NMatrix.new(:yale, [3,20], :float64)
+      n[2,1]   = 1.0
+      n[2,0]   = 1.5
+      n[2,15]  = 2.0
+      n[2,1].should == 1.0
+      n[2,0].should == 1.5
+      n[2,15].should == 2.0
+    end
 
-    c[0,0].should == 0.0
-    c[0,1].should == 0.0
-    c[0,2].should == 4.0
-    c[0,3].should == 4.0
-    c[1,0].should == 0.0
-    c[1,1].should == 2.0
-    c[1,2].should == 0.0
-    c[1,3].should == 0.0
-    c[2,0].should == 0.0
-    c[2,1].should == 0.0
-    c[2,2].should == 0.0
-    c[2,3].should == 0.0
-    c[3,0].should == 0.0
-    c[3,1].should == 0.0
-    c[3,2].should == 2.0
-    c[3,3].should == 2.0
-  end
+    it "sets values within large rows" do
+      n = NMatrix.new(:yale, [10,300], :float64)
+      n.extend(NMatrix::YaleFunctions)
+      n[5,1]   = 1.0
+      n[5,0]   = 1.5
+      n[5,15]  = 2.0
+      n[5,291] = 3.0
+      n[5,292] = 4.0
+      n[5,289] = 5.0
+      n[5,290] = 6.0
+      n[5,293] = 2.0
+      n[5,299] = 7.0
+      n[5,100] = 8.0
+      n.yale_lu.should == [1.5, 1.0, 2.0, 8.0, 5.0, 6.0, 3.0, 4.0, 2.0, 7.0]
+      n.yale_ja.should == [0,   1,   15,  100, 289, 290, 291, 292, 293, 299]
+    end
 
-  it "dots two identical matrices where a positive and negative partial sum cancel on the diagonal" do
-    a = NMatrix.new(:yale, 4, :float64)
+    it "gets values within large rows" do
+      n = NMatrix.new(:yale, [10,300], :float64)
+      n.extend(NMatrix::YaleFunctions)
+      n[5,1]   = 1.0
+      n[5,0]   = 1.5
+      n[5,15]  = 2.0
+      n[5,291] = 3.0
+      n[5,292] = 4.0
+      n[5,289] = 5.0
+      n[5,290] = 6.0
+      n[5,293] = 2.0
+      n[5,299] = 7.0
+      n[5,100] = 8.0
 
-    a[0,0] = 1.0
-    a[0,1] = 4.0
-    a[1,2] = 2.0
-    a[1,3] = -4.0
-    a[3,1] = 4.0
-    a[3,3] = 4.0
+      n.yale_ja.each_index do |idx|
+        j = n.yale_ja[idx]
+        n[5,j].should == n.yale_lu[idx]
+      end
+    end
 
-    b = a.dup
-    c = a.dot b
+    it "dots two identical matrices" do
+      a = NMatrix.new(:yale, 4, :float64)
+      a[0,1] = 4.0
+      a[1,2] = 1.0
+      a[1,3] = 1.0
+      a[3,1] = 2.0
 
-    #c[0,0].should == 1.0
-    #c[0,1].should == 4.0
-    #c[0,2].should == 8.0
-    #c[0,3].should == -16.0
-    #c[1,0].should == 0.0
-    #c[1,1].should == -16.0
-    #c[1,2].should == 0.0
-    #c[1,3].should == -16.0
-    #c[2,0].should == 0.0
-    #c[2,1].should == 0.0
-    #c[2,2].should == 0.0
-    #c[2,3].should == 0.0
-    #c[3,0].should == 0.0
-    #c[3,1].should == 0.0
-    #c[3,2].should == 8.0
-    #c[3,3].should == 0.0 # this is the positive and negative partial sum cancel
+      b = a.dup
+      c = a.dot b
 
-    c.extend(NMatrix::YaleFunctions)
+      c[0,0].should == 0.0
+      c[0,1].should == 0.0
+      c[0,2].should == 4.0
+      c[0,3].should == 4.0
+      c[1,0].should == 0.0
+      c[1,1].should == 2.0
+      c[1,2].should == 0.0
+      c[1,3].should == 0.0
+      c[2,0].should == 0.0
+      c[2,1].should == 0.0
+      c[2,2].should == 0.0
+      c[2,3].should == 0.0
+      c[3,0].should == 0.0
+      c[3,1].should == 0.0
+      c[3,2].should == 2.0
+      c[3,3].should == 2.0
+    end
 
-    c.yale_ija.reject { |i| i.nil? }.should == [5,8,9,9,11,1,2,3,3,1,2]
-    c.yale_a.reject { |i| i.nil? }.should == [1.0, -16.0, 0.0, 0.0, 0.0, 4.0, 8.0, -16.0, -16.0, 16.0, 8.0]
+    it "dots two identical matrices where a positive and negative partial sum cancel on the diagonal" do
+      a = NMatrix.new(:yale, 4, :float64)
 
-  end
+      a[0,0] = 1.0
+      a[0,1] = 4.0
+      a[1,2] = 2.0
+      a[1,3] = -4.0
+      a[3,1] = 4.0
+      a[3,3] = 4.0
 
-  it "transposes" do
-    a = NMatrix.new(:yale, 4, :float64)
-    a[0,0] = 1.0
-    a[0,1] = 4.0
-    a[1,2] = 2.0
-    a[1,3] = -4.0
-    a[3,1] = 5.0
-    a[3,3] = 6.0
-    b = a.transpose
+      b = a.dup
+      c = a.dot b
 
-    b[0,0].should == 1.0
-    b[1,0].should == 4.0
-    b[2,0].should == 0.0
-    b[3,0].should == 0.0
-    b[0,1].should == 0.0
-    b[1,1].should == 0.0
-    b[2,1].should == 2.0
-    b[3,1].should == -4.0
-    b[0,3].should == 0.0
-    b[1,3].should == 5.0
-    b[2,3].should == 0.0
-    b[3,3].should == 6.0
-  end
+      #c[0,0].should == 1.0
+      #c[0,1].should == 4.0
+      #c[0,2].should == 8.0
+      #c[0,3].should == -16.0
+      #c[1,0].should == 0.0
+      #c[1,1].should == -16.0
+      #c[1,2].should == 0.0
+      #c[1,3].should == -16.0
+      #c[2,0].should == 0.0
+      #c[2,1].should == 0.0
+      #c[2,2].should == 0.0
+      #c[2,3].should == 0.0
+      #c[3,0].should == 0.0
+      #c[3,1].should == 0.0
+      #c[3,2].should == 8.0
+      #c[3,3].should == 0.0 # this is the positive and negative partial sum cancel
+
+      c.extend(NMatrix::YaleFunctions)
+
+      c.yale_ija.reject { |i| i.nil? }.should == [5,8,9,9,11,1,2,3,3,1,2]
+      c.yale_a.reject { |i| i.nil? }.should == [1.0, -16.0, 0.0, 0.0, 0.0, 4.0, 8.0, -16.0, -16.0, 16.0, 8.0]
 
+    end
+
+    it "transposes" do
+      a = NMatrix.new(:yale, 4, :float64)
+      a[0,0] = 1.0
+      a[0,1] = 4.0
+      a[1,2] = 2.0
+      a[1,3] = -4.0
+      a[3,1] = 5.0
+      a[3,3] = 6.0
+      b = a.transpose
+
+      b[0,0].should == 1.0
+      b[1,0].should == 4.0
+      b[2,0].should == 0.0
+      b[3,0].should == 0.0
+      b[0,1].should == 0.0
+      b[1,1].should == 0.0
+      b[2,1].should == 2.0
+      b[3,1].should == -4.0
+      b[0,3].should == 0.0
+      b[1,3].should == 5.0
+      b[2,3].should == 0.0
+      b[3,3].should == 6.0
+    end
   end
 end

data/spec/nvector_spec.rb

@@ -29,15 +29,71 @@ require "./lib/nmatrix"
 
 describe NVector do
   it "initializes" do
-    v = NVector.new 5, :float64
+    v = NVector.new(5, 0, :float64)
     v.shape[0].should == 5
     v.shape[1].should == 1
   end
 
   it "permits setting and getting contents" do
+    v = NVector.new(5, 0, :float64)
+    v[0] = 1.555
+    v[0].should == 1.555
+  end
+  
+  it "transpose() changes raw and column stored structure" do
     v = NVector.new 5, :float64
+    v = v.transpose
+    v.shape[0].should == 1
+    v.shape[1].should == 5
     v[0] = 1.555
     v[0].should == 1.555
   end
 
-end
+  it "transpose!() changes destructively its raw and column stored structure" do
+    v = NVector.new 5, :float64
+    v.transpose!
+    v.shape[0].should == 1
+    v.shape[1].should == 5
+  end
+
+  it "multiply() multiples itself by another NVector" do
+    v1 = NVector.new 2, :float64
+    v2 = NVector.new 2, :float64
+    v1[0] = 1.5
+    v1[1] = 2.3
+    v2[0] = 1.3
+    v2[1] = 2.5
+    v1.multiply(v2).should == 12.0
+  end
+
+  it "multiply!() multiples destructively itself by another NVector" do
+    v1 = NVector.new 2, :float64
+    v2 = NVector.new 2, :float64
+    v1[0] = 1.5
+    v1[1] = 2.3
+    v2[0] = 1.3
+    v2[1] = 2.5
+    v1.multiply!(v2)
+    v1.should == 12.0
+  end
+
+  it "pretty_print() prints values to standard output with a pretty format" do
+    pending "pretty_print formatting is finalized"
+    v = NVector.new(5, 0)
+    $stdout = StringIO.new
+    v.pretty_print
+    out = $stdout.string
+    $stdout = STDOUT
+    out.should == "0  0  0  0  0\n"
+  end
+
+  it "inspect() formats the output with inspected, namely human readable format" do
+    pending "inspect output is finalized"
+    v = NVector.new(5, 0)
+    $stdout = StringIO.new
+    p v
+    out = $stdout.string
+    $stdout = STDOUT
+    out.should == "0  0  0  0  0\n"
+  end
+end