Skip to content

Commit

Permalink
* lib/matrix.rb: Matrix.zero can build rectangular matrices.
Browse files Browse the repository at this point in the history
  Vector#r should be called #magnitude

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
marcandre committed Jun 29, 2011
1 parent de97e94 commit 54bbc09
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Original file line Diff line number Diff line change
@@ -1,3 +1,8 @@
Wed Jun 29 10:13:12 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>

* lib/matrix.rb: Matrix.zero can build rectangular matrices.
Vector#r should be called #magnitude

Wed Jun 29 10:11:08 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca> Wed Jun 29 10:11:08 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>


* lib/matrix.rb: Add Matrix#diagonal?, hermitian?, normal?, * lib/matrix.rb: Add Matrix#diagonal?, hermitian?, normal?,
Expand Down
2 changes: 2 additions & 0 deletions NEWS
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -168,10 +168,12 @@ with all sufficient information, see the ChangeLog file.
* Matrix#unitary? * Matrix#unitary?
* Matrix#upper_triangular? * Matrix#upper_triangular?
* Matrix#zero? * Matrix#zero?
* Vector#magnitude
* extended methods: * extended methods:
* Matrix#each and #each_with_index can iterate on a subset of the elements * Matrix#each and #each_with_index can iterate on a subset of the elements
* Matrix#find_index returns [row, column] and can iterate on a subset * Matrix#find_index returns [row, column] and can iterate on a subset
of the elements of the elements
* Matrix.zero can build rectangular matrices


* net/http * net/http
* SNI (Server Name Indication) supported for HTTPS. * SNI (Server Name Indication) supported for HTTPS.
Expand Down
10 changes: 6 additions & 4 deletions lib/matrix.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -229,13 +229,14 @@ class << Matrix
end end


# #
# Creates an +n+ by +n+ zero matrix. # Creates a zero matrix.
# Matrix.zero(2) # Matrix.zero(2)
# => 0 0 # => 0 0
# 0 0 # 0 0
# #
def Matrix.zero(n) def Matrix.zero(row_size, column_size = row_size)
Matrix.scalar(n, 0) rows = Array.new(row_size){Array.new(column_size, 0)}
new rows, column_size
end end


# #
Expand Down Expand Up @@ -1723,9 +1724,10 @@ def map2(v, &block) # :yield: e1, e2
# Returns the modulus (Pythagorean distance) of the vector. # Returns the modulus (Pythagorean distance) of the vector.
# Vector[5,8,2].r => 9.643650761 # Vector[5,8,2].r => 9.643650761
# #
def r def magnitude
Math.sqrt(@elements.inject(0) {|v, e| v + e*e}) Math.sqrt(@elements.inject(0) {|v, e| v + e*e})
end end
alias r magnitude


#-- #--
# CONVERTING # CONVERTING
Expand Down

0 comments on commit 54bbc09

Please sign in to comment.