* lib/matrix.rb: Avoid using and.

Patch by gogo tanaka [#10058]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2014-07-18 10:04:15 +00:00
parent b794145222
commit b0eda56826
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
Fri Jul 18 19:03:53 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/matrix.rb: Avoid using `and`.
Patch by gogo tanaka [#10058]
Fri Jul 18 17:41:54 2014 GoGo tanaka <qlli.illb@gmail.com>
* test/matrix/test_matrix.rb: Add tests for Matrix class.

View File

@ -894,7 +894,7 @@ class Matrix
return apply_through_coercion(m, __method__)
end
Matrix.Raise ErrDimensionMismatch unless row_count == m.row_count and column_count == m.column_count
Matrix.Raise ErrDimensionMismatch unless row_count == m.row_count && column_count == m.column_count
rows = Array.new(row_count) {|i|
Array.new(column_count) {|j|
@ -921,7 +921,7 @@ class Matrix
return apply_through_coercion(m, __method__)
end
Matrix.Raise ErrDimensionMismatch unless row_count == m.row_count and column_count == m.column_count
Matrix.Raise ErrDimensionMismatch unless row_count == m.row_count && column_count == m.column_count
rows = Array.new(row_count) {|i|
Array.new(column_count) {|j|