зеркало из https://github.com/github/ruby.git
[ruby/matrix] Add `Matrix#rotate_entries` [#19]
Co-authored-by: Marc-André Lafortune <github@marc-andre.ca>
This commit is contained in:
Родитель
0130e17a41
Коммит
e34f51fe60
|
@ -1458,6 +1458,35 @@ class Matrix
|
||||||
rank
|
rank
|
||||||
end
|
end
|
||||||
|
|
||||||
|
#
|
||||||
|
# Returns a new matrix with rotated elements.
|
||||||
|
# The argument specifies the rotation (defaults to `:clockwise`):
|
||||||
|
# * :clockwise, 1, -3, etc.: "turn right" - first row becomes last column
|
||||||
|
# * :half_turn, 2, -2, etc.: first row becomes last row, elements in reverse order
|
||||||
|
# * :counter_clockwise, -1, 3: "turn left" - first row becomes first column
|
||||||
|
# (but with elements in reverse order)
|
||||||
|
#
|
||||||
|
# m = Matrix[ [1, 2], [3, 4] ]
|
||||||
|
# r = m.rotate_entries(:clockwise)
|
||||||
|
# # => Matrix[[3, 1], [4, 2]]
|
||||||
|
#
|
||||||
|
def rotate_entries(rotation = :clockwise)
|
||||||
|
rotation %= 4 if rotation.respond_to? :to_int
|
||||||
|
|
||||||
|
case rotation
|
||||||
|
when 0
|
||||||
|
dup
|
||||||
|
when 1, :clockwise
|
||||||
|
new_matrix @rows.transpose.each(&:reverse!), row_count
|
||||||
|
when 2, :half_turn
|
||||||
|
new_matrix @rows.map(&:reverse).reverse!, column_count
|
||||||
|
when 3, :counter_clockwise
|
||||||
|
new_matrix @rows.transpose.reverse!, row_count
|
||||||
|
else
|
||||||
|
raise ArgumentError, "expected #{rotation.inspect} to be one of :clockwise, :counter_clockwise, :half_turn or an integer"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
# Returns a matrix with entries rounded to the given precision
|
# Returns a matrix with entries rounded to the given precision
|
||||||
# (see Float#round)
|
# (see Float#round)
|
||||||
#
|
#
|
||||||
|
|
|
@ -829,4 +829,60 @@ class TestMatrix < Test::Unit::TestCase
|
||||||
assert_same obj1, obj2
|
assert_same obj1, obj2
|
||||||
RUBY
|
RUBY
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_rotate_with_symbol
|
||||||
|
assert_equal(Matrix[[4, 1], [5, 2], [6, 3]], @m1.rotate_entries)
|
||||||
|
assert_equal(@m1.rotate_entries, @m1.rotate_entries(:clockwise))
|
||||||
|
assert_equal(Matrix[[4, 1], [5, 2], [6, 3]],
|
||||||
|
@m1.rotate_entries(:clockwise))
|
||||||
|
assert_equal(Matrix[[3, 6], [2, 5], [1, 4]],
|
||||||
|
@m1.rotate_entries(:counter_clockwise))
|
||||||
|
assert_equal(Matrix[[6, 5, 4], [3, 2, 1]],
|
||||||
|
@m1.rotate_entries(:half_turn))
|
||||||
|
assert_equal(Matrix[[6, 5, 4], [3, 2, 1]],
|
||||||
|
@m1.rotate_entries(:half_turn))
|
||||||
|
assert_equal(Matrix.empty(0,2),
|
||||||
|
@e1.rotate_entries(:clockwise))
|
||||||
|
assert_equal(Matrix.empty(0,2),
|
||||||
|
@e1.rotate_entries(:counter_clockwise))
|
||||||
|
assert_equal(Matrix.empty(2,0),
|
||||||
|
@e1.rotate_entries(:half_turn))
|
||||||
|
assert_equal(Matrix.empty(0,3),
|
||||||
|
@e2.rotate_entries(:half_turn))
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_rotate_with_numeric
|
||||||
|
assert_equal(Matrix[[4, 1], [5, 2], [6, 3]],
|
||||||
|
@m1.rotate_entries(1))
|
||||||
|
assert_equal(@m2.rotate_entries(:half_turn),
|
||||||
|
@m2.rotate_entries(2))
|
||||||
|
assert_equal(@m2.rotate_entries(:half_turn),
|
||||||
|
@m1.rotate_entries(2))
|
||||||
|
assert_equal(@m1.rotate_entries(:counter_clockwise),
|
||||||
|
@m1.rotate_entries(3))
|
||||||
|
assert_equal(@m1,
|
||||||
|
@m1.rotate_entries(4))
|
||||||
|
assert_equal(@m1,
|
||||||
|
@m1.rotate_entries(4))
|
||||||
|
assert_not_same(@m1,
|
||||||
|
@m1.rotate_entries(4))
|
||||||
|
assert_equal(@m1.rotate_entries(:clockwise),
|
||||||
|
@m1.rotate_entries(5))
|
||||||
|
assert_equal(Matrix.empty(0,2),
|
||||||
|
@e1.rotate_entries(1))
|
||||||
|
assert_equal(@e2,
|
||||||
|
@e2.rotate_entries(2))
|
||||||
|
assert_equal(@e2.rotate_entries(1),
|
||||||
|
@e2.rotate_entries(3))
|
||||||
|
assert_equal(@e2.rotate_entries(:counter_clockwise),
|
||||||
|
@e2.rotate_entries(-1))
|
||||||
|
assert_equal(@m1.rotate_entries(:counter_clockwise),
|
||||||
|
@m1.rotate_entries(-1))
|
||||||
|
assert_equal(Matrix[[6, 5, 4], [3, 2, 1]],
|
||||||
|
@m1.rotate_entries(-2))
|
||||||
|
assert_equal(@m1,
|
||||||
|
@m1.rotate_entries(-4))
|
||||||
|
assert_equal(@m1.rotate_entries(-1),
|
||||||
|
@m1.rotate_entries(-5))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Загрузка…
Ссылка в новой задаче