01_enum_spec.rb in nmatrix-0.1.0.rc2

- old
+ new

@@ -53,13 +53,13 @@
               ii << i
               jj << j
             end
           end
 
-          vv.should == [7,8,9, 12,13,0, 0,0,0, 0,17,18]
-          ii.should == [0]*12
-          jj.should == [0,1,2]*4
+          expect(vv).to eq([7,8,9, 12,13,0, 0,0,0, 0,17,18])
+          expect(ii).to eq([0]*12)
+          expect(jj).to eq([0,1,2]*4)
         end
 
         it "should iterate along diagonal portion of A array" do
           vv = []
           ii = []
@@ -67,13 +67,13 @@
           @n.send :__yale_stored_diagonal_each_with_indices__ do |v,i,j|
             vv << v
             ii << i
             jj << j
           end
-          vv.should == [1,7,13,0,19]
-          ii.should == [0,1,2,3,4]
-          jj.should == ii
+          expect(vv).to eq([1,7,13,0,19])
+          expect(ii).to eq([0,1,2,3,4])
+          expect(jj).to eq(ii)
         end
 
         it "should iterate along non-diagonal portion of A array" do
           vv = []
           ii = []
@@ -82,13 +82,13 @@
             vv << v
             ii << i
             jj << j
           end
 
-          vv.should == [2,3,4,5,  6,8,9,10,  11,12,14,15,  16,17,18,20]
-          ii.should == [[0]*4, [1]*4, [2]*4, [4]*4].flatten
-          jj.should == [1,2,3,4,  0,2,3,5,   0,1,4,5,      0,2,3,5]
+          expect(vv).to eq([2,3,4,5,  6,8,9,10,  11,12,14,15,  16,17,18,20])
+          expect(ii).to eq([[0]*4, [1]*4, [2]*4, [4]*4].flatten)
+          expect(jj).to eq([1,2,3,4,  0,2,3,5,   0,1,4,5,      0,2,3,5])
         end
 
         it "should iterate along a sliced diagonal portion of an A array" do
           @m = @n[0..3,1..3]
           vv = []
@@ -97,13 +97,13 @@
           @m.send :__yale_stored_diagonal_each_with_indices__ do |v,i,j|
             vv << v
             ii << i
             jj << j
           end
-          vv.should == [7,13,0]
-          ii.should == [1,2,3]
-          jj.should == [0,1,2]
+          expect(vv).to eq([7,13,0])
+          expect(ii).to eq([1,2,3])
+          expect(jj).to eq([0,1,2])
         end
 
         it "should iterate along a sliced non-diagonal portion of a sliced A array" do
           vv = []
           ii = []
@@ -114,13 +114,13 @@
             vv << v
             ii << i
             jj << j
           end
 
-          ii.should == [0,0, 1,   3,3 ]
-          jj.should == [1,2, 0,   1,2 ]
-          vv.should == [8,9, 12, 17,18]
+          expect(ii).to eq([0,0, 1,   3,3 ])
+          expect(jj).to eq([1,2, 0,   1,2 ])
+          expect(vv).to eq([8,9, 12, 17,18])
         end
 
         it "should visit each stored element of the matrix in order by indices" do
           vv = []
           ii = []
@@ -129,13 +129,13 @@
             vv << v
             ii << i
             jj << j
           end
 
-          vv.should == [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 16, 17, 18, 19, 20]
-          ii.should == [[0]*5, [1]*5, [2]*5, [3]*1, [4]*5].flatten
-          jj.should == [0,1,2,3,4,  0,1,2,3,5,  0,1,2,4,5,  3,  0,2,3,4,5]
+          expect(vv).to eq([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 16, 17, 18, 19, 20])
+          expect(ii).to eq([[0]*5, [1]*5, [2]*5, [3]*1, [4]*5].flatten)
+          expect(jj).to eq([0,1,2,3,4,  0,1,2,3,5,  0,1,2,4,5,  3,  0,2,3,4,5])
         end
 
         it "should visit each stored element of the slice in order by indices" do
 
           vv = []
@@ -144,13 +144,13 @@
           @m.each_ordered_stored_with_indices do |v,i,j|
             vv << v
             ii << i
             jj << j
           end
-          ii.should == [0,0,0, 1,1,   2,  3,3  ]
-          jj.should == [0,1,2, 0,1,   2,  1,2  ]
-          vv.should == [7,8,9, 12,13, 0, 17,18 ]
+          expect(ii).to eq([0,0,0, 1,1,   2,  3,3  ])
+          expect(jj).to eq([0,1,2, 0,1,   2,  1,2  ])
+          expect(vv).to eq([7,8,9, 12,13, 0, 17,18 ])
         end
       end
 
       it "should visit each cell in the matrix as if dense, making indices available" do
         vv = []
@@ -160,13 +160,13 @@
           vv << v
           ii << i
           jj << j
         end
 
-        vv.should == [1,2,3,4,5,0,6,7,8,9,0,10,11,12,13,0,14,15,0,0,0,0,0,0,16,0,17,18,19,20]
-        ii.should == [[0]*6, [1]*6, [2]*6, [3]*6, [4]*6].flatten
-        jj.should == [0,1,2,3,4,5]*5
+        expect(vv).to eq([1,2,3,4,5,0,6,7,8,9,0,10,11,12,13,0,14,15,0,0,0,0,0,0,16,0,17,18,19,20])
+        expect(ii).to eq([[0]*6, [1]*6, [2]*6, [3]*6, [4]*6].flatten)
+        expect(jj).to eq([0,1,2,3,4,5]*5)
       end
 
       it "should visit each cell in the slice as if dense, making indices available" do
         vv = []
         ii = []
@@ -174,24 +174,24 @@
         @m.each_with_indices do |v,i,j|
           vv << v
           ii << i
           jj << j
         end
-        jj.should == [0,1,2]*4
-        ii.should == [[0]*3, [1]*3, [2]*3, [3]*3].flatten
-        vv.should == [7,8,9,12,13,0,0,0,0,0,17,18]
+        expect(jj).to eq([0,1,2]*4)
+        expect(ii).to eq([[0]*3, [1]*3, [2]*3, [3]*3].flatten)
+        expect(vv).to eq([7,8,9,12,13,0,0,0,0,0,17,18])
 
       end
 
       if stype == :list or stype == :dense then
         it "should correctly map to a matrix with a single element" do 
           nm = N.new([1], [2.0], stype: stype)
-          nm.map { |e| e**2 }.should eq N.new([1], [4.0], stype: stype)
+          expect(nm.map { |e| e**2 }).to eq N.new([1], [4.0], stype: stype)
         end
 
         it "should correctly map to a matrix with multiple elements" do
           nm = N.new([2], [2.0, 2.0], stype: stype)
-          nm.map { |e| e**2 }.should eq N.new([2], [4.0, 4.0], stype: stype)
+          expect(nm.map { |e| e**2 }).to eq N.new([2], [4.0, 4.0], stype: stype)
         end
       end
     end
   end
 end