extendmatrix 0.1.0 → 0.2.0

data/History.txt

@@ -1,3 +1,7 @@
-=== 0.0.60 / 2010-05-04
+=== 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
+
+=== 0.1.0 / 2010-05-04
 
 * First gem version

data/Manifest.txt

@@ -5,3 +5,4 @@ README.txt
 Rakefile
 lib/extendmatrix.rb
 spec/extendmatrix_spec.rb
+spec/spec.opts

data/lib/extendmatrix.rb

@@ -1,10 +1,9 @@
 require 'rational'
 require 'matrix'
-
 class Vector
   include Enumerable
-   # fix for Vector#coerce on Ruby 1.8.x
-   if RUBY_VERSION<="1.9.0"
+  # fix for Vector#coerce on Ruby 1.8.x
+  if RUBY_VERSION<="1.9.0"
     alias_method :old_coerce, :coerce
     def coerce(other)
       case other
@@ -14,14 +13,11 @@ class Vector
         raise TypeError, "#{self.class} can't be coerced into #{other.class}"
       end
     end
-    
   end
-  
+
   module Norm
-    def Norm.sqnorm(obj, p)
-      sum = 0
-      obj.each{|x| sum += x ** p}
-      sum
+    def self.sqnorm(obj, p)
+      obj.inject(0) {|ac,x| ac+(x**p)}
     end
   end
 
@@ -63,11 +59,12 @@ class Vector
   class << self
     #
     # Returns a concatenated Vector
+    # 
+    #   Vector.concat(Vector[1,2,3], Vector[4,5,6])
+    #   => Vector[1, 2, 3, 4, 5, 6]
     #
     def concat(*args)
-      v = []
-      args.each{|x| v += x.to_a}
-      Vector[*v]
+      Vector.elements(args.inject([]){|ac,v| ac+v.to_a}, false)
     end
   end
 
@@ -100,12 +97,17 @@ class Vector
   def min
     to_a.min
   end
-
+  #
+  # Returns the sum of values of the vector
+  # 
+  def sum
+    to_a.inject(&:+)
+  end
   #
   # Returns the p-norm of a vector
   #
   def norm(p = 2)
-    Norm.sqnorm(self, p) ** (Float(1)/p)
+    Norm.sqnorm(self, p) ** (1.quo(p))
   end
 
   #
@@ -143,7 +145,7 @@ class Vector
   #
   # Return the vector divided by a scalar
   #
-  def /(c)
+  def / (c)
     map {|e| e.quo(c)}
   end
 
@@ -193,7 +195,7 @@ class Vector
   # Return the vector normalized
   #
   def normalize
-    self / self.norm
+    self.quo(self.norm)
   end
 
   #
@@ -212,67 +214,58 @@ class Vector
   end
 end
 
-class Matrix 
-	
-   EXTENSION_VERSION="0.1.0"
+class Matrix
+
+  EXTENSION_VERSION="0.2.0"
   include Enumerable
-  public_class_method :new
 
   attr_reader :rows, :wrap
   @wrap = nil
-
-  def initialize(*argv)
-    return initialize_old(*argv) if argv[0].is_a?(Symbol)
-    n, m, val = argv; val = 0 if not val
-    f = (block_given?)? lambda {|i,j| yield(i, j)} : lambda {|i,j| val}
-    init_rows((0...n).collect {|i| (0...m).collect {|j| f.call(i,j)}}, true)
-  end
-
   #
   # For invoking a method
   #
-  def initialize_old(init_method, *argv)
+  def initialize_old(init_method, *argv) #:nodoc:
     self.send(init_method, *argv)
   end
 
   alias :ids :[]
   #
-	# Return a value or a vector/matrix of values depending 
-	# if the indexes are ranges or not
-	# m = Matrix.new(4, 3){|i, j| i * 3 + j}
-	# m: 0  1  2
-	#    3  4  5
-	#    6  7  8
-	#    9 10 11
-	# m[1, 2] => 5
-	# m[3,1..2] => Vector[10, 11]
-	# m[0..1, 0..2] => Matrix[[0, 1, 2], [3, 4, 5]]
-	#
-	def [](i, j)
-		case i
-		when Range 
-			case j
-			when Range
-				Matrix[*i.collect{|l| self.row(l)[j].to_a}]
-			else
-				column(j)[i]	
-			end
-		else
-			case j
-			when Range
-				row(i)[j]
-			else
-				ids(i, j)
-			end
-		end		
-	end
-
-  
-  
+  # Return a value or a vector/matrix of values depending
+  # if the indexes are ranges or not
+  # m = Matrix.new_with_value(4, 3){|i, j| i * 3 + j}
+  # m: 0  1  2
+  #    3  4  5
+  #    6  7  8
+  #    9 10 11
+  # m[1, 2] => 5
+  # m[3,1..2] => Vector[10, 11]
+  # m[0..1, 0..2] => Matrix[[0, 1, 2], [3, 4, 5]]
+  #
+  def [](i, j)
+    case i
+    when Range
+      case j
+      when Range
+        Matrix[*i.collect{|l| self.row(l)[j].to_a}]
+      else
+        column(j)[i]
+      end
+    else
+      case j
+      when Range
+        row(i)[j]
+      else
+        ids(i, j)
+      end
+    end
+  end
+
+
+
 
   #
   # Set the values of a matrix
-  # m = Matrix.new(3, 3){|i, j| i * 3 + j}
+  # m = Matrix.build(3, 3){|i, j| i * 3 + j}
   # m: 0  1  2
   #    3  4  5
   #    6  7  8
@@ -314,9 +307,9 @@ class Matrix
   end
 
   #
-  # Return a clone matrix
+  # Return a duplicate matrix
   #
-  def clone
+  def dup
     super
   end
 
@@ -327,6 +320,18 @@ class Matrix
 
 
   class << self
+     if !self.respond_to? :build
+	    #
+	    # Creates a matrix <tt>n</tt> x <tt>m</tt>
+	    # If you provide a block, it will be used to set the values.
+	    # If not, <tt>val</tt> will be used
+	    #
+	    
+	    def build(n,m,val=0)
+	      f = (block_given?)? lambda {|i,j| yield(i, j)} : lambda {|i,j| val}
+	      Matrix.rows((0...n).collect {|i| (0...m).collect {|j| f.call(i,j)}})
+	    end
+    end
     #
     # Creates a matrix with the given matrices as diagonal blocks
     #
@@ -377,7 +382,7 @@ class Matrix
   def quo(v)
     map {|e| e.quo(v)}
   end
-
+  alias :old_divition :/ 
   #
   # quo seems always desirable
   #
@@ -434,6 +439,8 @@ def cols_len
   (0...column_size).collect {|j| max_len_column(j)}
 end
 
+alias :to_s_old :to_s
+
 #
 # Returns a string for nice printing matrix
 #
@@ -541,7 +548,7 @@ alias :column_collect! :column!
 
 #
 # Set a certain column with the values of a Vector
-# m = Matrix.new(3, 3){|i, j| i * 3 + j + 1}
+# m = Matrix.build(3, 3){|i, j| i * 3 + j + 1}
 # m.column= 1, Vector[1, 1, 1], 1..2
 # m => 1 2 3
 #      4 1 6
@@ -569,7 +576,7 @@ def row=(args)
 end
 
 def norm(p = 2)
-  Vector::Norm.sqnorm(self, p) ** (Float(1)/p)
+  Vector::Norm.sqnorm(self, p) ** (1.quo(p))
 end
 
 def norm_frobenius
@@ -587,8 +594,9 @@ end
 #
 # Returns the row/s of matrix as a Matrix
 #
+
 def row2matrix(r)
-  a = self.send(:row, r).to_a
+  a = row(r).to_a
   if r.is_a?(Range) and r.entries.size > 1
     return Matrix[*a]
   else
@@ -597,10 +605,10 @@ def row2matrix(r)
 end
 
 #
-# Returns the colomn/s of matrix as a Matrix
+# Returns the column/s of matrix as a Matrix
 #
 def column2matrix(c)
-  a = self.send(:column, c).to_a
+  a = column(c).to_a
   if c.is_a?(Range) and c.entries.size > 1
     return Matrix[*a]
   else
@@ -608,23 +616,23 @@ def column2matrix(c)
   end
 end
 
-# Calculate marginal of rows
-  def row_sum
+# Returns the marginal of rows
+def row_sum
   (0...row_size).collect {|i|
-    row(i).to_a.inject(0) {|a,v| a+v}
+    row(i).sum
   }
-  end
-  # Calculate marginal of columns
-  def column_sum
+end
+# Returns  the  of columns
+def column_sum
   (0...column_size).collect {|i|
-    column(i).to_a.inject(0) {|a,v| a+v}
+    column(i).sum
   }
-  end
+end
 # Calculate sum of cells
-  def total_sum
-    row_sum.inject(0){|a,v| a+v}
-  end
-  
+def total_sum
+  row_sum.inject(&:+)
+end
+
 module LU
   #
   #	Return the Gauss vector, MC, Golub, 3.2.1 Gauss Transformation, p94
@@ -796,7 +804,7 @@ module Householder
     a = clone
     n = column_size
     m = row_size
-    q = Matrix.new(m, n){0}
+    q = Matrix.build(m, n){0}
     r = Matrix.zero(n)
     for k in 0...n
       r[k,k] = a[0...m, k].norm

data/spec/extendmatrix_spec.rb

@@ -8,21 +8,27 @@ describe "Vector class extension:" do
   before do
     @v = Vector.[](1, 2, 3, 4)
   end
-
-  it "[] method" do
-    v = @v.clone
-    v[1..2] = Vector[9, 9, 9, 9, 9]
-    v.should == Vector[1, 9, 9, 4]
+  it "[] with range returns correct values" do
+  @v[1..2]==Vector[2,3]
   end
-
-  it "Vector.concat method" do
+  it "[]= should change only specified range" do
+    @v[1..2] = Vector[9, 9, 9, 9, 9]
+    @v.should == Vector[1, 9, 9, 4]
+  end
+  
+  it "Vector.concat method should concat vectors" do
     Vector.concat(Vector[1], Vector[2, 3]).should == Vector[1, 2, 3]
     Vector.concat(Vector[1], Vector[2, 3], Vector[4, 5]).should ==  Vector[1, 2, 3, 4, 5]
   end
-
-  it "collect method" do
-    @v.collect!{|i| i * i}.should == Vector.[](1, 4, 9, 16)
-    @v.collect!{|i| 3 * i}.should == Vector.[](3, 12, 27, 48)
+  it "collect method returns collected vector and doesn't change original" do
+  @v.collect{|i| i*i}.should== Vector.[](1,4,9,16)
+  @v.should==Vector[1,2,3,4]
+  end
+  it "collect! method should change vector" do
+    @v.collect!{|i| i * i}
+    @v.should == Vector.[](1, 4, 9, 16)
+    @v.collect!{|i| 3 * i}
+    @v.should == Vector.[](3, 12, 27, 48)
   end
 
   it "each method" do
@@ -31,15 +37,15 @@ describe "Vector class extension:" do
     r.should == [2, 3, 4, 5]
   end
 
-  it "max element" do
+  it "max method should return max element" do
     @v.max.should == 4
   end
 
-  it "max element" do
+  it "min method should return min element" do
     @v.min.should == 1
   end
 
-  it "norm method" do
+  it "norm method returns correct norm" do
     v = Vector.[](3, 4)
     v.norm.should == 5
   end
@@ -66,7 +72,7 @@ describe "Vector class extension:" do
     v.norm(4).should < 4.29
   end
 
-  it "[]= method" do
+  it "[]= method should change specific value" do
     @v[3] = 10
     @v.should == Vector.[](1, 2, 3, 10)
   end
@@ -74,17 +80,20 @@ describe "Vector class extension:" do
   it "norm_inf" do
     @v.norm_inf.should == 4
   end
+  it "sum method returns the sum of elements" do
+    @v.sum.should==10
+  end
 end
 
 describe "Matrix class extension:" do
   before do
     @m = Matrix[[1, 2, 222], [2, 33, 4]]
   end
-  it "to_s method" do
+  it "to_s method should return something" do
     @m.to_s.size.should_not == 0
   end
   it "[] method" do
-    m = Matrix.new(4, 3){|i, j| i * 3 + j}
+    m = Matrix.build(4, 3){|i, j| i * 3 + j}
     m[1, 2].should == 5
     m[3, 1..2].should ==  Vector[10, 11]
     m[0..1, 0..2].should == Matrix[[0, 1, 2], [3, 4, 5]]
@@ -100,7 +109,7 @@ describe "Matrix class extension:" do
   end
   
   it "[]= method" do
-    m = Matrix.new(3, 3){|i, j| i * 3 + j}
+    m = Matrix.build(3, 3){|i, j| i * 3 + j}
     m[1, 2] = 9
     m.should == Matrix[[0, 1, 2], [3, 4, 9], [6, 7, 8]]
     m[1, 1..2] = Vector[8, 8]
@@ -110,14 +119,14 @@ describe "Matrix class extension:" do
   end
 
   it "set method" do
-    n = Matrix.new(2, 3)
+    n = Matrix.build(2, 3)
     n.set(@m)
     n.should == @m
   end
 
   it "set method and wrap value" do
     @m.wrap = :torus
-    n = Matrix.new(2, 3)
+    n = Matrix.build(2, 3)
     n.set(@m)
     n.wrap.should == :torus
   end
@@ -173,7 +182,7 @@ describe "Matrix class extension:" do
   end
 
   it "column= " do
-    m = Matrix.new(3, 3){|i, j| i * 3 + j + 1}
+    m = Matrix.build(3, 3){|i, j| i * 3 + j + 1}
     m.column= 1, Vector[1,1,1,1,1,1]
     m.should == Matrix[[1, 1, 3],[4, 1, 6],[7, 1, 9]]
     m.column= 2, Vector[9,9], 0..1
@@ -181,7 +190,7 @@ describe "Matrix class extension:" do
   end
 
   it "row= " do
-    m = Matrix.new(3, 3){|i, j| i * 3 + j + 1}
+    m = Matrix.build(3, 3){|i, j| i * 3 + j + 1}
     m.row= 1, Vector[1,1,1,1,1,1]
     m.should == Matrix[[1, 2, 3],[1, 1, 1],[7, 8, 9]]
     m.row= 2, Vector[9,9], 0..2
@@ -200,14 +209,14 @@ describe "Matrix class extension:" do
   end
 
   it "row2matrix" do
-    m = Matrix.new(4, 3){|i, j| i * 3 + j + 1}
+    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
   end
 
   it "column2matrix" do
-    m = Matrix.new(4, 3){|i, j| i * 3 + j + 1}
+    m = Matrix.build(4, 3){|i, j| i * 3 + j + 1}
     m.column2matrix(1).should == Matrix[[2], [5], [8], [11]]
   end
 
@@ -215,7 +224,7 @@ describe "Matrix class extension:" do
     m1 = Matrix[[1]]
     m2 = Matrix[[2, 0], [0, 3]]
     m3 = Matrix[[4, 0, 0], [0, 5, 0], [0, 0, 6]]
-    a1 = Matrix.new(6, 6){|i, j| i == j ? i + 1: 0}
+    a1 = Matrix.build(6, 6){|i, j| i == j ? i + 1: 0}
     Matrix.diag(m1, m2, m3).should == a1
     Matrix.diag(m2).should == m2
     a2 = Matrix[[2, 0, 0, 0],
@@ -226,7 +235,7 @@ describe "Matrix class extension:" do
   end
 
   it "equal_in_delta" do
-    m = Matrix.new(4, 3){|i, j| i * 3 + j +1}
+    m = Matrix.build(4, 3){|i, j| i * 3 + j +1}
     Matrix.equal_in_delta?(m, m).should == true
     mm = m.clone
     mm[0,0] += 2
@@ -235,8 +244,8 @@ describe "Matrix class extension:" do
   end
 
   it "diag_in_delta" do
-    Matrix.diag_in_delta?(Matrix.I(5), Matrix.new(4, 4){|i, j| i + j}).should == false
-    m  = Matrix.new(5, 5){|i, j| i == j ? 1 + 0.001 * (i+1) : i + j}
+    Matrix.diag_in_delta?(Matrix.I(5), Matrix.build(4, 4){|i, j| i + j}).should == false
+    m  = Matrix.build(5, 5){|i, j| i == j ? 1 + 0.001 * (i+1) : i + j}
     Matrix.diag_in_delta?(Matrix.I(5), m, 0.01).should == true
   end
 
@@ -269,7 +278,7 @@ describe "Matrix class extension:" do
   end
 
   it "houseQR " do
-    m = Matrix.new(4, 3){|i, j| i * 3 + j +1}
+    m = Matrix.build(4, 3){|i, j| i * 3 + j +1}
     Matrix.equal_in_delta?(m, m.houseQ * m.houseR).should == true
     q = Matrix[[0.0776, 0.8330, 0.5329,  0.1264],
       [0.3104, 0.4512, -0.8048, 0.2286],
@@ -279,7 +288,7 @@ describe "Matrix class extension:" do
   end
 
   it "houseR " do
-    m = Matrix.new(4, 3){|i, j| i * 3 + j +1}
+    m = Matrix.build(4, 3){|i, j| i * 3 + j +1}
     r = Matrix[[12.88409, 14.59162, 16.29916],
       [       0,  1.04131, 2.082630],
       [       0,        0,        0],
@@ -289,7 +298,7 @@ describe "Matrix class extension:" do
 
   it "bidiagonalization" do
     # MC, Golub, p252, Example 5.4.2
-    m = Matrix.new(4, 3){|i, j| i * 3 + j +1}
+    m = Matrix.build(4, 3){|i, j| i * 3 + j +1}
     bidiag = Matrix[[12.884,  21.876, 0     ],
       [0,       2.246,  -0.613],
       [0,       0,      0     ],
@@ -309,7 +318,7 @@ describe "Matrix class extension:" do
   end
 
   it "givens " do
-    m = Matrix.new(4, 3){|i, j| i * 3 + j +1}
+    m = Matrix.build(4, 3){|i, j| i * 3 + j +1}
     Matrix.equal_in_delta?(m, m.givensQ * m.givensR, 0.001).should == true
   end
 
@@ -337,7 +346,7 @@ describe "Matrix class extension:" do
   end
 
   it "realSchur" do
-    m = Matrix.new(3, 3){1} + Matrix.diagonal(2, 2, 2)
+    m = Matrix.build(3, 3){1} + Matrix.diagonal(2, 2, 2)
     e = Matrix[[5, 0, 0],[0, 2, 0],[0, 0, 2]]
     Matrix.diag_in_delta?(m.realSchur, e, 1.0e-5).should == true
   end

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Cosmin Bonchis
@@ -92,6 +92,7 @@ files:
 - Rakefile
 - lib/extendmatrix.rb
 - spec/extendmatrix_spec.rb
+- spec/spec.opts
 has_rdoc: true
 homepage: http://github.com/clbustos/extendmatrix
 licenses: []

metadata.gz.sig

@@ -1,2 +1,2 @@
-��׮�2Hq=6���)c�f��WJۭ� �m��O�UguS+	�xJ�޾�,T&5�2,��@F�1�mk�p����}��zk�i��CN.'b9]�Ve[g�0�������q�v�D��t^gK�؟\��mA�Y6`[�s�����k�V��f\�\�Rm�P��l��0�e����F2�g�h�+���P#�W�/%U:�%s�R� �@��D�dƁ�
-��w���ՖdzM�*�e�&Pl�02SA/I;s@����|
+�`@�\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�