diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/matrix.rb | 2 | ||||
| -rw-r--r-- | test/matrix/test_matrix.rb | 14 |
3 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Oct 3 12:37:48 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + * lib/matrix.rb: Fix Matrix.rows copy bug. + Patch by Arron Mabrey. [Fix GH-707] + Fri Oct 3 06:06:28 2014 Eric Wong <e@80x24.org> * st.c (next_pow2): new function (from old bignum.c) diff --git a/lib/matrix.rb b/lib/matrix.rb index ed5390f873..45c24d1275 100644 --- a/lib/matrix.rb +++ b/lib/matrix.rb @@ -152,7 +152,7 @@ class Matrix # -1 66 # def Matrix.rows(rows, copy = true) - rows = convert_to_array(rows) + rows = convert_to_array(rows, copy) rows.map! do |row| convert_to_array(row, copy) end diff --git a/test/matrix/test_matrix.rb b/test/matrix/test_matrix.rb index 7c466e67fd..3e1e0db91e 100644 --- a/test/matrix/test_matrix.rb +++ b/test/matrix/test_matrix.rb @@ -177,6 +177,20 @@ class TestMatrix < Test::Unit::TestCase assert_equal(@m1, Matrix.rows([[1, 2, 3], [4, 5, 6]])) end + def test_rows_copy + rows1 = [[1], [1]] + rows2 = [[1], [1]] + + m1 = Matrix.rows(rows1, copy = false) + m2 = Matrix.rows(rows2, copy = true) + + rows1.uniq! + rows2.uniq! + + assert_equal([[1]], m1.to_a) + assert_equal([[1], [1]], m2.to_a) + end + def test_columns assert_equal(@m1, Matrix.columns([[1, 4], [2, 5], [3, 6]])) end |