extendmatrix 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.1 / 2010-05-05
+
+* Works on Ruby 1.9.2. Fixed conflicts between old and new Matrix implementation
+
 === 0.2.0 / 2010-05-04
 * More rubyesque implementation of some methods
 * Matrix#new is not altered and previously extended #new is called #new_with_values

data/lib/extendmatrix.rb

@@ -39,6 +39,7 @@ class Vector
     end
   end
 
+  
   #
   # Sets a vector value/(range of values) with a new value/(values from a vector)
   # v = Vector[1, 2, 3]
@@ -216,7 +217,7 @@ end
 
 class Matrix
 
-  EXTENSION_VERSION="0.2.0"
+  EXTENSION_VERSION="0.2.1"
   include Enumerable
 
   attr_reader :rows, :wrap
@@ -227,7 +228,11 @@ class Matrix
   def initialize_old(init_method, *argv) #:nodoc:
     self.send(init_method, *argv)
   end
-
+  # Return an empty matrix on n=0
+  # else, returns I(n)
+  def self.robust_I(n)
+    n>0 ? self.I(n) : self.[]
+  end
   alias :ids :[]
   #
   # Return a value or a vector/matrix of values depending
@@ -592,11 +597,15 @@ def empty?
 end
 
 #
-# Returns the row/s of matrix as a Matrix
+# Returns row(s) of matrix as a Matrix
 #
 
 def row2matrix(r)
-  a = row(r).to_a
+  if r.is_a? Range
+    a=r.map {|v| v<row_size ? row(v).to_a : nil }.find_all {|v| !v.nil?}
+  else
+    a = row(r).to_a
+  end
   if r.is_a?(Range) and r.entries.size > 1
     return Matrix[*a]
   else
@@ -608,9 +617,13 @@ end
 # Returns the column/s of matrix as a Matrix
 #
 def column2matrix(c)
-  a = column(c).to_a
-  if c.is_a?(Range) and c.entries.size > 1
-    return Matrix[*a]
+  if c.is_a?(Range)
+    a=c.map {|v| column(v).to_a}.find_all {|v| v.size>0}
+  else
+    a = column(c).to_a
+  end
+  if c.is_a?(Range)
+    return Matrix.columns(a)
   else
     return Matrix[*a.collect{|x| [x]}]
   end
@@ -701,16 +714,15 @@ module Householder
     a = mat.clone
     m = a.row_size
     n = a.column_size
-    n.times{|j|
+    n.times do |j|
       v, beta = a[j..m - 1, j].house
-
-      h[j] = Matrix.diag(Matrix.I(j), Matrix.I(m-j)- beta * (v * v.t))
-
+      h[j] = Matrix.diag(Matrix.robust_I(j), Matrix.I(m-j)- beta * (v * v.t))
+      
       a[j..m-1, j..n-1] = (Matrix.I(m-j) - beta * (v * v.t)) * a[j..m-1, j..n-1]
-    a[(j+1)..m-1,j] = v[2..(m-j)] if j < m - 1 }
+      a[(j+1)..m-1,j] = v[2..(m-j)] if j < m - 1 
+    end
     h
   end
-
   #
   # From the essential part of Householder vector
   # it returns the coresponding upper(U_j)/lower(V_j) matrix
@@ -718,7 +730,9 @@ module Householder
   def self.bidiagUV(essential, dim, beta)
     v = Vector.concat(Vector[1], essential)
     dimv = v.size
-    Matrix.diag(Matrix.I(dim - dimv), Matrix.I(dimv) - beta * (v * v.t) )
+    
+    
+    Matrix.diag(Matrix.robust_I(dim - dimv), Matrix.I(dimv) - beta * (v * v.t) )
   end
 
   #
@@ -899,7 +913,7 @@ module Householder
         for j in (0...n-1)
           c, s = Givens.givens(r[j,j], r[j+1, j])
           cs = Matrix[[c, s], [-s, c]]
-          q *= Matrix.diag(Matrix.I(j), cs, Matrix.I(n - j - 2))
+          q *= Matrix.diag(Matrix.robust_I(j), cs, Matrix.robust_I(n - j - 2))
           r[j..j+1, j..n-1] = cs.t * r[j..j+1, j..n-1]
         end
         return q, r

data/spec/extendmatrix_spec.rb

@@ -210,6 +210,7 @@ describe "Matrix class extension:" do
 
   it "row2matrix" do
     m = Matrix.build(4, 3){|i, j| i * 3 + j + 1}
+    
     m.row2matrix(1..2).should == Matrix[[4, 5, 6],[7, 8, 9]]
     m.row2matrix(2).should == Matrix[[7, 8, 9]]
     m.row2matrix(0..4).should == m
@@ -218,6 +219,10 @@ describe "Matrix class extension:" do
   it "column2matrix" do
     m = Matrix.build(4, 3){|i, j| i * 3 + j + 1}
     m.column2matrix(1).should == Matrix[[2], [5], [8], [11]]
+    m.column2matrix(1..1).should == Matrix[[2], [5], [8], [11]]
+
+    m.column2matrix(1..2).should == Matrix[[2,3], [5,6], [8,9], [11,12]]
+    
   end
 
   it "diag" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Cosmin Bonchis
@@ -35,7 +35,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-05-04 00:00:00 -04:00
+date: 2010-05-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

metadata.gz.sig

@@ -1,2 +1,5 @@
-�`@�\M8�V��$�=h �g��Uc�e���b�Li8�p/��F�nfѦ�5���xm��bD�Uہ������o`�����}�w`C�x��Dvb�����\����y�]hd)�c��]���.��#�Om�!s��(y~���Y��!	����B��k��~�kS�C��
-!⥥7��AM�?�}Z|�=��a�Hϓk�j�f�L�J�0,y0M�I�gA�N"�2դy�TOBk�eIO��3�
+l�L�=�� �BA`���@<�HW
+<O�.�M~X�>�M��
+�x1Ψ�-Uq���ۋ��%TfVVE+g�UPN�5��.�.N�l��l��g�ɨ"�W4=f�{�HMR��
���'�]2��`;������m9M�m�9�}l�XDn5�FQ�;�
+q�6
+