From 54bbc098fa1e05570e960750bf2c86d45017e575 Mon Sep 17 00:00:00 2001
From: marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 29 Jun 2011 01:13:22 +0000
Subject: [PATCH] * lib/matrix.rb: Matrix.zero can build rectangular matrices. 
  Vector#r should be called #magnitude

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog     |  5 +++++
 NEWS          |  2 ++
 lib/matrix.rb | 10 ++++++----
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 14b8f6861d2205..8b14f5a5cf1cc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* lib/matrix.rb: Add Matrix#diagonal?, hermitian?, normal?,
diff --git a/NEWS b/NEWS
index f400391b67561d..6758e745644c6d 100644
--- a/NEWS
+++ b/NEWS
@@ -168,10 +168,12 @@ with all sufficient information, see the ChangeLog file.
     * Matrix#unitary?
     * Matrix#upper_triangular?
     * Matrix#zero?
+    * Vector#magnitude
   * extended methods:
     * 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
       of the elements
+    * Matrix.zero can build rectangular matrices
 
 * net/http
   * SNI (Server Name Indication) supported for HTTPS. 
diff --git a/lib/matrix.rb b/lib/matrix.rb
index 02c157801d9dd2..3242cde9b202c3 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -229,13 +229,14 @@ class << Matrix
   end
 
   #
-  # Creates an +n+ by +n+ zero matrix.
+  # Creates a zero matrix.
   #   Matrix.zero(2)
   #     => 0 0
   #        0 0
   #
-  def Matrix.zero(n)
-    Matrix.scalar(n, 0)
+  def Matrix.zero(row_size, column_size = row_size)
+    rows = Array.new(row_size){Array.new(column_size, 0)}
+    new rows, column_size
   end
 
   #
@@ -1723,9 +1724,10 @@ def map2(v, &block) # :yield: e1, e2
   # Returns the modulus (Pythagorean distance) of the vector.
   #   Vector[5,8,2].r => 9.643650761
   #
-  def r
+  def magnitude
     Math.sqrt(@elements.inject(0) {|v, e| v + e*e})
   end
+  alias r magnitude
 
   #--
   # CONVERTING