@@ -3,22 +3,35 @@ require 'matrix' describe "Matrix#column" do before :all do - @m = Matrix[[1,2],[1,2]] + @m = Matrix[[1,2,3], [2,3,4]] end it "returns a Vector when called without a block" do - @m.column(1).should == Vector[2,2] + @m.column(1).should == Vector[2,3] end it "yields each element in the column to the block" do - @m.column(1) do |n| - n.should == 2 - end + a = [] + @m.column(1) {|n| a << n } + a.should == [2,3] end + it "counts backwards for negative argument" do + @m.column(-1).should == Vector[3, 4] + end + ruby_bug "redmine:1532", "1.8.7" do + it "returns self when called with a block" do + @m.column(0) { |x| x }.should equal(@m) + end + it "returns nil when out of bounds" do - @m.column(2).should == nil + @m.column(3).should == nil + end + + it "never yields when out of bounds" do + lambda { @m.column(3){ raise } }.should_not raise_error + lambda { @m.column(-4){ raise } }.should_not raise_error end end -end \ No newline at end of file +end library/matrix/column_spec.rb @@ -19,8 +19,6 @@ describe "Matrix#column_vectors" do @vectors.should == [Vector[1,3], Vector[2,4]] end - # See Ruby bug #1526 for discussion of inconsistency between - # #column_vectors and #row_vectors it "returns an empty Array for empty matrices" do Matrix[ [] ].column_vectors.should == [] end library/matrix/column_vectors_spec.rb @@ -9,6 +9,11 @@ describe "Matrix.diagonal" do it "returns an object of type Matrix" do @m.class.should == Matrix end + + it "returns a square Matrix of the right size" do + @m.column_size.should == 5 + @m.row_size.should == 5 + end it "sets the diagonal to the arguments" do (0..4).each do |i| library/matrix/diagonal_spec.rb @@ -15,11 +15,7 @@ describe "Matrix#[]" do end end - # FIXME: Update this guard when the bug is fixed. - ruby_bug "#1518", "1.9.1.129" do - # A NoMethodError is raised when the _first_ index is out of bounds, - # (http://redmine.ruby-lang.org/issues/show/1518); otherwise nil is - # returned. + ruby_bug "#1518", "1.8.7" do it "returns nil for an invalid index pair" do @m[8,1].should be_nil @m[1,8].should be_nil library/matrix/element_reference_spec.rb @@ -3,5 +3,11 @@ require File.dirname(__FILE__) + '/shared/equal_value' require 'matrix' describe "Matrix#eql?" do - it_behaves_like(:equal, :eql) -end + it_behaves_like(:equal, :eql?) + + ruby_bug("[ruby-dev:36298]", "1.8.7") do + it "returns false if some elements are == but not eql?" do + Matrix[[1, 2],[3, 4]].eql?(Matrix[[1, 2],[3, 4.0]]).should be_false + end + end +end \ No newline at end of file library/matrix/eql_spec.rb @@ -3,5 +3,9 @@ require File.dirname(__FILE__) + '/shared/equal_value' require 'matrix' describe "Matrix#==" do - it_behaves_like(:equal, :equal_value) + it_behaves_like(:equal, :==) + + it "returns true if some elements are == but not eql?" do + Matrix[[1, 2],[3, 4]].should == Matrix[[1, 2],[3, 4.0]] + end end library/matrix/equal_value_spec.rb @@ -1,10 +1,6 @@ require File.dirname(__FILE__) + '/../../spec_helper' require 'matrix' -# Note: Matrix just computes a bitwise OR of the element's .hash values, so -# their position in the matrix isn't taken into account. This means that -# matrices with the same elements in different positions will generate the -# same .hash code... describe "Matrix#hash" do it "returns a Fixnum" do library/matrix/hash_spec.rb @@ -7,4 +7,16 @@ describe "Matrix#inspect" do Matrix[ [1,2], [2,1] ].inspect.should == "Matrix[[1, 2], [2, 1]]" end + ruby_bug "redmine:1532", "1.8.7" do + it "returns 'Matrix.empty(...)' for empty matrices" do + Matrix[ [], [], [] ].inspect.should == "Matrix.empty(3, 0)" + Matrix.columns([ [], [], [] ]).inspect.should == "Matrix.empty(0, 3)" + end + end + + it "calls inspect on its contents" do + obj = mock("some_value") + obj.should_receive(:inspect).and_return("some_value") + Matrix[ [1, 2], [3, obj] ].inspect.should == "Matrix[[1, 2], [3, some_value]]" + end end library/matrix/inspect_spec.rb @@ -21,8 +21,22 @@ describe "Matrix#minor" do end it "returns nil for out-of-bounds start_row/col" do - @matrix.minor(4,0,0,10).should == nil - @matrix.minor(0,10,3,9).should == nil + r = @matrix.row_size + 1 + c = @matrix.column_size + 1 + @matrix.minor(r,0,0,10).should == nil + @matrix.minor(0,10,c,9).should == nil + @matrix.minor(-r,0,0,10).should == nil + @matrix.minor(0,10,-c,9).should == nil + end + + it "returns nil for negative nrows or ncols" do + @matrix.minor(0,1,0,-1).should == nil + @matrix.minor(0,-1,0,1).should == nil + end + + it "start counting backwards for start_row or start_col below zero" do + @matrix.minor(0, 1, -1, 1).should == @matrix.minor(0, 1, 1, 1) + @matrix.minor(-1, 1, 0, 1).should == @matrix.minor(2, 1, 0, 1) end end @@ -46,8 +60,22 @@ describe "Matrix#minor" do end ruby_bug "redmine:1532", "1.8.7" do - it "returns an empty Matrix if col_range or row_range don't select any elements" do - @matrix.minor(3..6, 3..6).should == nil + it "returns nil if col_range or row_range is out of range" do + r = @matrix.row_size + 1 + c = @matrix.column_size + 1 + @matrix.minor(r..6, c..6).should == nil + @matrix.minor(0..1, c..6).should == nil + @matrix.minor(r..6, 0..1).should == nil + @matrix.minor(-r..6, -c..6).should == nil + @matrix.minor(0..1, -c..6).should == nil + @matrix.minor(-r..6, 0..1).should == nil + end + + it "start counting backwards for col_range or row_range below zero" do + @matrix.minor(0..1, -2..-1).should == @matrix.minor(0..1, 0..1) + @matrix.minor(0..1, -2..1).should == @matrix.minor(0..1, 0..1) + @matrix.minor(-2..-1, 0..1).should == @matrix.minor(1..2, 0..1) + @matrix.minor(-2..2, 0..1).should == @matrix.minor(1..2, 0..1) end end end library/matrix/minor_spec.rb @@ -20,9 +20,9 @@ describe "Matrix#-" do end it "raises a ExceptionForMatrix::ErrOperationNotDefined if other is a Numeric Type" do - lambda { @a - 2 }.should raise_error(ExceptionForMatrix::ErrOperationNotDefined) - lambda { @a - 1.2 }.should raise_error(ExceptionForMatrix::ErrOperationNotDefined) - lambda { @a - bignum_value }.should raise_error(ExceptionForMatrix::ErrOperationNotDefined) + lambda { @a - 2 }.should raise_error(Matrix::ErrOperationNotDefined) + lambda { @a - 1.2 }.should raise_error(Matrix::ErrOperationNotDefined) + lambda { @a - bignum_value }.should raise_error(Matrix::ErrOperationNotDefined) end it "raises an exception if other is not a Matrix" do library/matrix/minus_spec.rb @@ -7,9 +7,6 @@ describe "Matrix#regular?" do # from writing a complete specification here. it "needs to be reviewed for spec completeness" - # On Ruby 1.9.1 the below tests cause hangs, presumably due to bug #1020. - # They pass in 1.8.7. When #1020 is fixed, we can determine whether it was - # the cause of this failure... ruby_bug "#1020", "1.9.1.129" do it "returns false unless rank(A) != n" do m = Matrix[ [1,2,3], [3,4,3], [0,0,0] ] library/matrix/regular_spec.rb @@ -2,8 +2,12 @@ require File.dirname(__FILE__) + '/../../spec_helper' require 'matrix' describe "Matrix#row_size" do - it "returns the number of elements in a row" do - data = [[1,2], [3, 4]] - Matrix[ *data ].row_size.should == 2 + it "returns the number rows" do + Matrix[ [1,2], [3, 4], [5, 6] ].row_size.should == 3 end + + it "returns the number rows even for some empty matrices" do + Matrix[ [], [], [] ].row_size.should == 3 + end + end library/matrix/row_size_spec.rb @@ -3,20 +3,36 @@ require 'matrix' describe "Matrix#row" do before :all do - @m = Matrix[ [1, 2], [1, 2] ] + @m = Matrix[ [1, 2], [2, 3], [3, 4] ] end it "returns a Vector when called without a block" do @m.row(0).should == Vector[1,2] end + it "yields the elements of the row when called with a block" do + a = [] + @m.row(0) {|x| a << x} + a.should == [1,2] + end + + it "counts backwards for negative argument" do + @m.row(-1).should == Vector[3, 4] + end + ruby_bug "redmine:1532", "1.8.7" do it "returns self when called with a block" do @m.row(0) { |x| x }.should equal(@m) end it "returns nil when out of bounds" do - @m.row(2).should == nil + @m.row(3).should == nil + @m.row(-4).should == nil + end + + it "never yields when out of bounds" do + lambda { @m.row(3){ raise } }.should_not raise_error + lambda { @m.row(-4){ raise } }.should_not raise_error end end end \ No newline at end of file library/matrix/row_spec.rb @@ -1,5 +1,4 @@ require 'matrix' -require File.dirname(__FILE__) + '/../../../fixtures/matrix' describe :equal, :shared => true do before do @@ -7,19 +6,16 @@ describe :equal, :shared => true do end it "returns true for self" do - @matrix.eql?(@matrix).should be_true + @matrix.send(@method, @matrix).should be_true end - ruby_bug("[ruby-dev:36298]", "1.8.7") do - it "returns true when the each corresponding elements are equal in the sense of Object#eql?" do - @matrix.eql?(Matrix[ [1, 2, 3, 4, 5], [2, 3, 4, 5, 6] ]).should be_true - - num1, num2 = TrivialField.new, TrivialField.new - Matrix[[num1]].eql?(Matrix[[num2]]).should be_true - end + it "returns true for equal matrices" do + @matrix.send(@method, Matrix[ [1, 2, 3, 4, 5], [2, 3, 4, 5, 6] ]).should be_true + end - it "returns false when there are a pair corresponding elements which are not equal in the sense of Object#eql?" do - @matrix.eql?(Matrix[ [1, 2, 3, 4, 5.0], [2, 3, 4, 5, 6] ]).should be_false - end + it "returns false for different matrices" do + @matrix.send(@method, Matrix[ [42, 2, 3, 4, 5], [2, 3, 4, 5, 6] ]).should be_false + @matrix.send(@method, Matrix[ [1, 2, 3, 4, 5, 6], [2, 3, 4, 5, 6, 7] ]).should be_false + @matrix.send(@method, Matrix[ [1, 2, 3], [2, 3, 4] ]).should be_false end end library/matrix/shared/equal_value.rb @@ -5,7 +5,6 @@ describe :trace, :shared => true do Matrix[[7,6], [3,9]].trace.should == 16 end - # Crashes with NoMethodError: undefined method `[]' for nil:NilClass ruby_bug "redmine:1532", "1.8.7" do it "returns the sum of diagonal elements in a rectangular Matrix" do lambda{ Matrix[[1,2,3], [4,5,6]].trace}.should raise_error(Matrix::ErrDimensionMismatch) library/matrix/shared/trace.rb @@ -4,4 +4,11 @@ describe :matrix_transpose, :shared => true do it "returns a transposed matrix" do Matrix[[1, 2], [3, 4], [5, 6]].send(@method).should == Matrix[[1, 3, 5], [2, 4, 6]] end + + ruby_bug "redmine:1532", "1.8.7" do + it "can transpose empty matrices" do + m = Matrix[[], [], []] + m.send(@method).send(@method).should == m + end + end end library/matrix/shared/transpose.rb @@ -12,12 +12,19 @@ describe "Matrix#square?" do Matrix[ [9] ].square?.should be_true end - it "returns false when the Matrix is 0xn" do + it "returns false when the Matrix is rectangular" do Matrix[ [1, 2] ].square?.should be_false end - it "returns false when the Matrix is nx0" do + it "returns false when the Matrix is rectangular" do Matrix[ [1], [2] ].square?.should be_false end - + + ruby_bug "redmine:1532", "1.8.7" do + it "returns handles empty matrices" do + Matrix[].square?.should be_true + Matrix[[]].square?.should be_false + Matrix.columns([[]]).square?.should be_false + end + end end library/matrix/square_spec.rb @@ -1,6 +1,5 @@ require File.dirname(__FILE__) + '/../../../spec_helper' require 'matrix' -require File.dirname(__FILE__) + '/../../../fixtures/matrix' describe "Vector#eql?" do before do @@ -12,13 +11,6 @@ describe "Vector#eql?" do end ruby_bug("[ruby-dev:36298]", "1.8.7") do - it "returns true when the each corresponding elements are equal in the sense of Object#eql?" do - @vector.eql?(Vector[1, 2, 3, 4, 5]).should be_true - - num1, num2 = TrivialField.new, TrivialField.new - Vector[num1].eql?(Vector[num2]).should be_true - end - it "returns false when there are a pair corresponding elements which are not equal in the sense of Object#eql?" do @vector.eql?(Vector[1, 2, 3, 4, 5.0]).should be_false end library/matrix/vector/eql_spec.rb @@ -26,29 +26,4 @@ describe "Matrix.zero" do end end end - - it "returns an object of type Matrix" do - Matrix.zero(3).class.should == Matrix - end - - it "creates a square matrix with size given by the argument" do - m3 = Matrix.zero(3) - m3.row_size.should == 3 - m3.column_size.should == 3 - - m8 = Matrix.zero(8) - m8.row_size.should == 8 - m8.column_size.should == 8 - end - - it "initializes all cells to 0" do - size = 10 # arbitrary value - m = Matrix.zero(size) - - (0...size).each do |i| - (0...size).each do |j| - m[i, j].should == 0 - end - end - end end library/matrix/zero_spec.rb fixtures/matrix.rb library/matrix/init_rows_spec.rb e61f29ed945f181383efcf1b5b622918dad659b1 Marc-Andre Lafortune github@marc-andre.ca http://github.com/rubyspec/rubyspec/commit/7b5aeca89b6eee6d2ad2b133171440c9b09ed719 7b5aeca89b6eee6d2ad2b133171440c9b09ed719 2009-10-23T22:58:53-07:00 2009-10-23T22:58:53-07:00 lib/matrix: additional specs for empty matrices, negative and out of bound indices fix of == and eql? specs other clean up b25b4f50a5077fc51138993a4ab615b9e6f21667 Marc-Andre Lafortune github@marc-andre.ca