stick 1.3.2 → 1.3.3

data/lib/stick/constants/typeless_mks.rb

@@ -14,115 +14,114 @@
 #   - Daniel Carrera
 #   - Brian Gough
 
-#
+module Stick #:nodoc:
 module Constants
+module Typeless
 
-    module Typeless
-
-      # Unitless constants in the MKS system (meters, kg, sec)
-
-      module MKS
-        SPEED_OF_LIGHT           = 2.99792458e8      # m / s
-        GRAVITATIONAL_CONSTANT   = 6.673e-11  # m^3 / kg s^2
-        PLANCKS_CONSTANT_H       = 6.62606876e-34 # kg m^2 / s
-        PLANCKS_CONSTANT_HBAR    = 1.05457159642e-34 # kg m^2 / s
-        VACUUM_PERMEABILITY      = 1.25663706144e-6 # kg m / A^2 s^2
-        ASTRONOMICAL_UNIT        = 1.49597870691e11   # m
-        LIGHT_YEAR               = 9.46053620707e15 # m
-        PARSEC                   = 3.08567758135e16 # m
-        GRAV_ACCEL               = 9.80665e0        # m / s^2
-        ELECTRON_VOLT            = 1.602176462e-19  # kg m^2 / s^2
-        MASS_ELECTRON            = 9.10938188e-31 # kg
-        MASS_MUON                = 1.88353109e-28 # kg
-        MASS_PROTON              = 1.67262158e-27 # kg
-        MASS_NEUTRON             = 1.67492716e-27 # kg
-        RYDBERG                  = 2.17987190389e-18 # kg m^2 / s^2
-        BOLTZMANN                = 1.3806503e-23   # kg m^2 / K s^2
-        BOHR_MAGNETON            = 9.27400899e-24  # A m^2
-        NUCLEAR_MAGNETON         = 5.05078317e-27 # A m^2
-        ELECTRON_MAGNETIC_MOMENT = 9.28476362e-24 # A m^2
-        PROTON_MAGNETIC_MOMENT   = 1.410606633e-26  # A m^2
-        MOLAR_GAS                = 8.314472e0       # kg m^2 / K mol s^2
-        STANDARD_GAS_VOLUME      = 2.2710981e-2 # m^3 / mol
-        MINUTE                   = 6e1        # s
-        HOUR                     = 3.6e3      # s
-        DAY                      = 8.64e4     # s
-        WEEK                     = 6.048e5    # s
-        INCH                     = 2.54e-2    # m
-        FOOT                     = 3.048e-1   # m
-        YARD                     = 9.144e-1   # m
-        MILE                     = 1.609344e3 # m
-        NAUTICAL_MILE            = 1.852e3    # m
-        FATHOM                   = 1.8288e0   # m
-        MIL                      = 2.54e-5    # m
-        POINT                    = 3.52777777778e-4 # m
-        TEXPOINT                 = 3.51459803515e-4 # m
-        MICRON                   = 1e-6    # m
-        ANGSTROM                 = 1e-10   # m
-        HECTARE                  = 1e4     # m^2
-        ACRE                     = 4.04685642241e3 # m^2
-        BARN                     = 1e-28   # m^2
-        LITER                    = 1e-3    # m^3
-        US_GALLON                = 3.78541178402e-3 # m^3
-        QUART                    = 9.46352946004e-4 # m^3
-        PINT                     = 4.73176473002e-4 # m^3
-        CUP                      = 2.36588236501e-4 # m^3
-        FLUID_OUNCE              = 2.95735295626e-5 # m^3
-        TABLESPOON               = 1.47867647813e-5 # m^3
-        TEASPOON                 = 4.92892159375e-6 # m^3
-        CANADIAN_GALLON          = 4.54609e-3  # m^3
-        UK_GALLON                = 4.546092e-3 # m^3
-        MILES_PER_HOUR           = 4.4704e-1   # m / s
-        KILOMETERS_PER_HOUR      = 2.77777777778e-1 # m / s
-        KNOT                     = 5.14444444444e-1 # m / s
-        POUND_MASS               = 4.5359237e-1     # kg
-        OUNCE_MASS               = 2.8349523125e-2  # kg
-        TON                      = 9.0718474e2      # kg
-        METRIC_TON               = 1e3     # kg
-        UK_TON                   = 1.0160469088e3 # kg
-        TROY_OUNCE               = 3.1103475e-2   # kg
-        CARAT                    = 2e-4    # kg
-        UNIFIED_ATOMIC_MASS      = 1.66053873e-27 # kg
-        ATOMIC_MASS              = 1.66053873e-27 # kg
-        GRAM_FORCE               = 9.80665e-3 # kg m / s^2
-        POUND_FORCE              = 4.44822161526e0 # kg m / s^2
-        KILOPOUND_FORCE          = 4.44822161526e3 # kg m / s^2
-        POUNDAL                  = 1.38255e-1 # kg m / s^2
-        CALORIE                  = 4.1868e0   # kg m^2 / s^2
-        BTU                      = 1.05505585262e3 # kg m^2 / s^2
-        THERM                    = 1.05506e8  # kg m^2 / s^2
-        HORSEPOWER               = 7.457e2    # kg m^2 / s^3
-        BAR                      = 1e5        # kg / m s^2
-        STD_ATMOSPHERE           = 1.01325e5  # kg / m s^2
-        TORR                     = 1.33322368421e2  # kg / m s^2
-        METER_OF_MERCURY         = 1.33322368421e5 # kg / m s^2
-        INCH_OF_MERCURY          = 3.38638815789e3  # kg / m s^2
-        INCH_OF_WATER            = 2.490889e2 # kg / m s^2
-        PSI                      = 6.89475729317e3 # kg / m s^2
-        POISE                    = 1e-1    # kg m^-1 s^-1
-        STOKES                   = 1e-4    # m^2 / s
-        FARADAY                  = 9.6485341472e4  # A s / mol
-        ELECTRON_CHARGE          = 1.602176462e-19 # A s
-        GAUSS                    = 1e-4    # kg / A s^2
-        STILB                    = 1e4     # cd / m^2
-        LUMEN                    = 1e0     # cd sr
-        LUX                      = 1e0     # cd sr / m^2
-        PHOT                     = 1e4     # cd sr / m^2
-        FOOTCANDLE               = 1.076e1 # cd sr / m^2
-        LAMBERT                  = 1e4     # cd sr / m^2
-        FOOTLAMBERT              = 1.07639104e1 # cd sr / m^2
-        CURIE                    = 3.7e10  # 1 / s
-        ROENTGEN                 = 2.58e-4 # A s / kg
-        RAD                      = 1e-2    # m^2 / s^2
-        SOLAR_MASS               = 1.98892e30 # kg
-        BOHR_RADIUS              = 5.291772083e-11 # m
-        VACUUM_PERMITTIVITY      = 8.854187817e-12 # A^2 s^4 / kg m^3
-        NEWTON                   = 1e0     # kg m / s^2
-        DYNE                     = 1e-5    # kg m / s^2
-        JOULE                    = 1e0     # kg m^2 / s^2
-        ERG                      = 1e-7    # kg m^2 / s^2
-      end
+  # Unitless constants in the MKS system (meters, kg, sec)
 
-    end
+  module MKS
+    SPEED_OF_LIGHT           = 2.99792458e8      # m / s
+    GRAVITATIONAL_CONSTANT   = 6.673e-11  # m^3 / kg s^2
+    PLANCKS_CONSTANT_H       = 6.62606876e-34 # kg m^2 / s
+    PLANCKS_CONSTANT_HBAR    = 1.05457159642e-34 # kg m^2 / s
+    VACUUM_PERMEABILITY      = 1.25663706144e-6 # kg m / A^2 s^2
+    ASTRONOMICAL_UNIT        = 1.49597870691e11   # m
+    LIGHT_YEAR               = 9.46053620707e15 # m
+    PARSEC                   = 3.08567758135e16 # m
+    GRAV_ACCEL               = 9.80665e0        # m / s^2
+    ELECTRON_VOLT            = 1.602176462e-19  # kg m^2 / s^2
+    MASS_ELECTRON            = 9.10938188e-31 # kg
+    MASS_MUON                = 1.88353109e-28 # kg
+    MASS_PROTON              = 1.67262158e-27 # kg
+    MASS_NEUTRON             = 1.67492716e-27 # kg
+    RYDBERG                  = 2.17987190389e-18 # kg m^2 / s^2
+    BOLTZMANN                = 1.3806503e-23   # kg m^2 / K s^2
+    BOHR_MAGNETON            = 9.27400899e-24  # A m^2
+    NUCLEAR_MAGNETON         = 5.05078317e-27 # A m^2
+    ELECTRON_MAGNETIC_MOMENT = 9.28476362e-24 # A m^2
+    PROTON_MAGNETIC_MOMENT   = 1.410606633e-26  # A m^2
+    MOLAR_GAS                = 8.314472e0       # kg m^2 / K mol s^2
+    STANDARD_GAS_VOLUME      = 2.2710981e-2 # m^3 / mol
+    MINUTE                   = 6e1        # s
+    HOUR                     = 3.6e3      # s
+    DAY                      = 8.64e4     # s
+    WEEK                     = 6.048e5    # s
+    INCH                     = 2.54e-2    # m
+    FOOT                     = 3.048e-1   # m
+    YARD                     = 9.144e-1   # m
+    MILE                     = 1.609344e3 # m
+    NAUTICAL_MILE            = 1.852e3    # m
+    FATHOM                   = 1.8288e0   # m
+    MIL                      = 2.54e-5    # m
+    POINT                    = 3.52777777778e-4 # m
+    TEXPOINT                 = 3.51459803515e-4 # m
+    MICRON                   = 1e-6    # m
+    ANGSTROM                 = 1e-10   # m
+    HECTARE                  = 1e4     # m^2
+    ACRE                     = 4.04685642241e3 # m^2
+    BARN                     = 1e-28   # m^2
+    LITER                    = 1e-3    # m^3
+    US_GALLON                = 3.78541178402e-3 # m^3
+    QUART                    = 9.46352946004e-4 # m^3
+    PINT                     = 4.73176473002e-4 # m^3
+    CUP                      = 2.36588236501e-4 # m^3
+    FLUID_OUNCE              = 2.95735295626e-5 # m^3
+    TABLESPOON               = 1.47867647813e-5 # m^3
+    TEASPOON                 = 4.92892159375e-6 # m^3
+    CANADIAN_GALLON          = 4.54609e-3  # m^3
+    UK_GALLON                = 4.546092e-3 # m^3
+    MILES_PER_HOUR           = 4.4704e-1   # m / s
+    KILOMETERS_PER_HOUR      = 2.77777777778e-1 # m / s
+    KNOT                     = 5.14444444444e-1 # m / s
+    POUND_MASS               = 4.5359237e-1     # kg
+    OUNCE_MASS               = 2.8349523125e-2  # kg
+    TON                      = 9.0718474e2      # kg
+    METRIC_TON               = 1e3     # kg
+    UK_TON                   = 1.0160469088e3 # kg
+    TROY_OUNCE               = 3.1103475e-2   # kg
+    CARAT                    = 2e-4    # kg
+    UNIFIED_ATOMIC_MASS      = 1.66053873e-27 # kg
+    ATOMIC_MASS              = 1.66053873e-27 # kg
+    GRAM_FORCE               = 9.80665e-3 # kg m / s^2
+    POUND_FORCE              = 4.44822161526e0 # kg m / s^2
+    KILOPOUND_FORCE          = 4.44822161526e3 # kg m / s^2
+    POUNDAL                  = 1.38255e-1 # kg m / s^2
+    CALORIE                  = 4.1868e0   # kg m^2 / s^2
+    BTU                      = 1.05505585262e3 # kg m^2 / s^2
+    THERM                    = 1.05506e8  # kg m^2 / s^2
+    HORSEPOWER               = 7.457e2    # kg m^2 / s^3
+    BAR                      = 1e5        # kg / m s^2
+    STD_ATMOSPHERE           = 1.01325e5  # kg / m s^2
+    TORR                     = 1.33322368421e2  # kg / m s^2
+    METER_OF_MERCURY         = 1.33322368421e5 # kg / m s^2
+    INCH_OF_MERCURY          = 3.38638815789e3  # kg / m s^2
+    INCH_OF_WATER            = 2.490889e2 # kg / m s^2
+    PSI                      = 6.89475729317e3 # kg / m s^2
+    POISE                    = 1e-1    # kg m^-1 s^-1
+    STOKES                   = 1e-4    # m^2 / s
+    FARADAY                  = 9.6485341472e4  # A s / mol
+    ELECTRON_CHARGE          = 1.602176462e-19 # A s
+    GAUSS                    = 1e-4    # kg / A s^2
+    STILB                    = 1e4     # cd / m^2
+    LUMEN                    = 1e0     # cd sr
+    LUX                      = 1e0     # cd sr / m^2
+    PHOT                     = 1e4     # cd sr / m^2
+    FOOTCANDLE               = 1.076e1 # cd sr / m^2
+    LAMBERT                  = 1e4     # cd sr / m^2
+    FOOTLAMBERT              = 1.07639104e1 # cd sr / m^2
+    CURIE                    = 3.7e10  # 1 / s
+    ROENTGEN                 = 2.58e-4 # A s / kg
+    RAD                      = 1e-2    # m^2 / s^2
+    SOLAR_MASS               = 1.98892e30 # kg
+    BOHR_RADIUS              = 5.291772083e-11 # m
+    VACUUM_PERMITTIVITY      = 8.854187817e-12 # A^2 s^4 / kg m^3
+    NEWTON                   = 1e0     # kg m / s^2
+    DYNE                     = 1e-5    # kg m / s^2
+    JOULE                    = 1e0     # kg m^2 / s^2
+    ERG                      = 1e-7    # kg m^2 / s^2
+  end
 
 end
+end
+end

data/lib/stick/currency.rb

@@ -1,5 +1,6 @@
 require 'stick/units/currency'
 
+module Stick
 module Units
 
   # Load conversion units.
@@ -8,3 +9,4 @@ module Units
   end
 
 end
+end

data/lib/stick/mapcar.rb

@@ -9,38 +9,50 @@
 # NOTES:
 #
 #   Google Summer of Code 2007 project for Ruby Central Inc.
+#
+# TODO:
+#   - #mapcar should ne be defined in toplevel. But Matrix
+#    is using it at class-level. WTF?
 
 require 'generator'
-#
-# Non-recursive mapcar (works on all Enumerables)
-#
-def mapcar(*enums)
-  generators = enums.collect { |e| Generator.new(e) }
-  result = []
-  while true
-    begin
-      params = generators.collect { |g| g.current; g.next }
-        rescue EOFError
-      return result
+
+#module Enumerable
+
+  # Non-recursive mapcar (works on all Enumerables)
+
+  def mapcar(*enums)
+    generators = enums.collect { |e| Generator.new(e) }
+    result = []
+    while true
+      begin
+        params = generators.collect { |g| g.current; g.next }
+          rescue EOFError
+        return result
+      end
+      result << yield(*params)
     end
-    result << yield(*params)
   end
-end
 
-def map(*enums)
-  generators = []; enums.each { |e| generators << Generator.new(e) }
-  while true
-    begin
-      params = []; generators.each { |g| g.current; params << g.next }
-        rescue EOFError
-      return
+  #
+
+  def map(*enums)
+    generators = []; enums.each { |e| generators << Generator.new(e) }
+    while true
+      begin
+        params = []; generators.each { |g| g.current; params << g.next }
+          rescue EOFError
+        return
+      end
+      yield(*params)
     end
-    yield(*params)
   end
-end
+
+#end
+
 
 class Array
-  def Array.map(n, *arrays)
+
+  def self.map(n, *arrays)
     len = arrays.length
     if n == 0
       n = arrays[0].length
@@ -57,5 +69,6 @@ class Array
       yield(*params)
     end
   end
+
 end
 

data/lib/stick/matrix.rb

@@ -1,22 +1,18 @@
-# = TITLE:
-#
-#   Matrix Extensions
-#
-# AUTHOR:
-#
-#   Cosmin Bonchis
-#
-# NOTES:
-#
-#   Google Summer of Code 2007 project for Ruby Central Inc.
-
 require 'rational'
-require 'matrix'
 
 require 'stick/mapcar'
+require 'stick/matrix/core'
+require 'stick/matrix/givens'
+require 'stick/matrix/hessenberg'
+require 'stick/matrix/householder'
+require 'stick/matrix/jacobi'
+require 'stick/matrix/lu'
+
 
+module Stick
 
 class Vector
+
   include Enumerable
 
   module Norm
@@ -599,168 +595,6 @@ class Matrix
     end
   end
 
-  module LU
-    #
-    #  Return the Gauss vector, MC, Golub, 3.2.1 Gauss Transformation, p94
-    #
-    def LU.gauss_vector(mat, k)
-      t = mat.column2matrix(k)
-      tk = t[k, 0]
-      (0..k).each{|i| t[i, 0] = 0}
-      return t if tk == 0
-      (k+1...mat.row_size).each{|i| t[i, 0] = t[i, 0].to_f / tk}
-      t
-    end
-
-    #
-    # Return the Gauss transformation matrix: M_k = I - tau * e_k^T
-    #
-    def LU.gauss(mat, k)
-      i = Matrix.I(mat.column_size)
-      tau = gauss_vector(mat, k)
-      e = i.row2matrix(k)
-      i - tau * e
-    end
-
-    #
-    # LU factorization: A = LU
-    # where L is lower triangular and U is upper triangular
-    #
-    def LU.factorization(mat)
-      u = mat.clone
-      n = u.column_size
-      i = Matrix.I(n)
-       l = i.clone
-      (n-1).times {|k|
-        mk = gauss(u, k)
-        u = mk * u  # M_{n-1} * ... * M_1 * A = U
-        l += i - mk  # L = M_1^{-1} * ... * M_{n-1}^{-1} = I + sum_{k=1}^{n-1} tau * e
-      }
-      return l, u
-    end
-  end
-
-  #
-  # Return the upper triangular matrix of LU factorization
-  # M_{n-1} * ... * M_1 * A = U
-  #
-  def U
-    LU.factorization(self)[1]
-  end
-
-  #
-  # Return the lower triangular matrix of LU factorization
-  # L = M_1^{-1} * ... * M_{n-1}^{-1} = I + sum_{k=1}^{n-1} tau * e
-  #
-  def L
-    LU.factorization(self)[0]
-  end
-
-  module Householder
-    #
-    # a QR factorization that uses Householder transformation
-    # Q^T * A = R
-    # MC, Golub & van Loan, pg 224, 5.2.1 Householder QR
-    #
-    def Householder.QR(mat)
-      h = []
-      a = mat.clone
-      m = a.row_size
-      n = a.column_size
-      n.times{|j|
-        v, beta = a[j..m - 1, j].house
-
-        h[j] = Matrix.diag(Matrix.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 }
-      h
-    end
-
-    #
-    # From the essential part of Householder vector
-    # it returns the coresponding upper(U_j)/lower(V_j) matrix
-    #
-    def Householder.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) )
-    end
-
-    #
-    # Householder Bidiagonalization algorithm. MC, Golub, pg 252, Algorithm 5.4.2
-    # Returns the matrices U_B and V_B such that: U_B^T * A * V_B = B,
-    # where B is upper bidiagonal.
-    #
-    def Householder.bidiag(mat)
-      a = mat.clone
-      m = a.row_size
-      n = a.column_size
-      ub = Matrix.I(m)
-      vb = Matrix.I(n)
-      n.times{|j|
-        v, beta = a[j..m-1,j].house
-        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[1..(m-j-1)]
-        ub *= bidiagUV(a[j+1..m-1,j], m, beta) #Ub = U_1 * U_2 * ... * U_n
-        if j < n - 2
-          v, beta = (a[j, j+1..n-1]).house
-          a[j..m-1, j+1..n-1] = a[j..m-1, j+1..n-1] * (Matrix.I(n-j-1) - beta * (v * v.t))
-          a[j, j+2..n-1] = v[1..n-j-2]
-          vb  *= bidiagUV(a[j, j+2..n-1], n, beta) #Vb = V_1 * U_2 * ... * V_n-2
-        end  }
-      return ub, vb
-    end
-
-    #
-    #Householder Reduction to Hessenberg Form
-    #
-    def Householder.toHessenberg(mat)
-      h = mat.clone
-      n = h.row_size
-      u0 = Matrix.I(n)
-      for k in (0...n - 2)
-        v, beta = h[k+1..n-1, k].house #the householder matrice part
-        houseV = Matrix.I(n-k-1) - beta * (v * v.t)
-        u0 *= Matrix.diag(Matrix.I(k+1), houseV)
-        h[k+1..n-1, k..n-1] = houseV * h[k+1..n-1, k..n-1]
-        h[0..n-1, k+1..n-1] = h[0..n-1, k+1..n-1] * houseV
-      end
-      return h, u0
-    end
-
-
-  end #end of Householder module
-
-  #
-  # Returns the upper bidiagonal matrix obtained with Householder Bidiagonalization algorithm
-  #
-  def bidiagonal
-    ub, vb = Householder.bidiag(self)
-    ub.t * self * vb
-  end
-
-  #
-  # Returns the orthogonal matrix Q of Householder QR factorization
-  # where Q = H_1 * H_2 * H_3 * ... * H_n,
-  #
-  def houseQ
-    h = Householder.QR(self)
-    q = h[0]
-    (1...h.size).each{|i| q *= h[i]}
-    q
-  end
-
-  #
-  # Returns the matrix R of Householder QR factorization
-  # R = H_n * H_n-1 * ... * H_1 * A is an upper triangular matrix
-  #
-  def houseR
-    h = Householder.QR(self)
-    r = self.clone
-    h.size.times{|i| r = h[i] * r}
-    r
-  end
 
   #
   # Modified Gram Schmidt QR factorization (MC, Golub, p. 232)
@@ -798,225 +632,6 @@ class Matrix
     gram_schmidt[1]
   end
 
-
-  module Givens
-    #
-    # Returns the values "c and s" of a Given rotation
-    # MC, Golub, pg 216, Alghorithm 5.1.3
-    #
-    def Givens.givens(a, b)
-      if b == 0
-        c = 0; s = 0
-      else
-        if b.abs > a.abs
-          tau = Float(-a)/b; s = 1/Math.sqrt(1+tau**2); c = s * tau
-        else
-          tau = Float(-b)/a; c = 1/Math.sqrt(1+tau**2); s = c * tau
-        end
-      end
-      return c, s
-    end
-
-    #
-    # a QR factorization using Givens rotation
-    # Computes the upper triangular matrix R and the orthogonal matrix Q
-    # where Q^t A = R (MC, Golub, p227 algorithm 5.2.2)
-    #
-    def Givens.QR(mat)
-      r = mat.clone
-      m = r.row_size
-      n = r.column_size
-      q = Matrix.I(m)
-      n.times{|j|
-        m-1.downto(j+1){|i|
-          c, s = givens(r[i - 1, j], r[i, j])
-          qt = Matrix.I(m); qt[i-1..i, i-1..i] = Matrix[[c, s],[-s, c]]
-          q *= qt
-          r[i-1..i, j..n-1] = Matrix[[c, -s],[s, c]] * r[i-1..i, j..n-1]}}
-      return r, q
-    end
-
-  end
-
-  #
-  # Returns the upper triunghiular matrix R of a Givens QR factorization
-  #
-  def givensR
-    Givens.QR(self)[0]
-  end
-
-  #
-  # Returns the orthogonal matrix Q of Givens QR factorization.
-  # Q = G_1 * ... * G_t where G_j is the j'th Givens rotation
-  # and 't' is the total number of rotations
-  #
-  def givensQ
-    Givens.QR(self)[1]
-  end
-
-  module Hessenberg
-    #
-    #  the matrix must be an upper R^(n x n) Hessenberg matrix
-    #
-    def Hessenberg.QR(mat)
-      r = mat.clone
-      n = r.row_size
-      q = Matrix.I(n)
-      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))
-        r[j..j+1, j..n-1] = cs.t * r[j..j+1, j..n-1]
-      end
-      return q, r
-    end
-  end
-
-  #
-  # Returns the orthogonal matrix Q of Hessenberg QR factorization
-  # Q = G_1 *...* G_(n-1) where G_j is the Givens rotation G_j = G(j, j+1, omega_j)
-  #
-  def hessenbergQ
-    Hessenberg.QR(self)[0]
-  end
-
-  #
-  # Returns the upper triunghiular matrix R of a Hessenberg QR factorization
-  #
-  def hessenbergR
-    Hessenberg.QR(self)[1]
-  end
-
-  #
-  # Return an upper Hessenberg matrix obtained with Householder reduction to Hessenberg Form algorithm
-  #
-  def hessenberg_form_H
-    Householder.toHessenberg(self)[0]
-  end
-
-  #
-  # The real Schur decomposition.
-  # The eigenvalues are aproximated in diagonal elements of the real Schur decomposition matrix
-  #
-  def realSchur(eps = 1.0e-10, steps = 100)
-    h = self.hessenberg_form_H
-    h1 = Matrix[]
-    i = 0
-    loop do
-      h1 = h.hessenbergR * h.hessenbergQ
-      break if Matrix.diag_in_delta?(h1, h, eps) or steps <= 0
-      h = h1.clone
-      steps -= 1
-      i += 1
-    end
-    h1
-  end
-
-
-  module Jacobi
-    #
-    # Returns the nurm of the off-diagonal element
-    #
-    def Jacobi.off(a)
-      n = a.row_size
-      sum = 0
-      n.times{|i| n.times{|j| sum += a[i, j]**2 if j != i}}
-      Math.sqrt(sum)
-    end
-
-    #
-    # Returns the index pair (p, q) with 1<= p < q <= n and A[p, q] is the maximum in absolute value
-    #
-    def Jacobi.max(a)
-      n = a.row_size
-      max = 0
-      p = 0
-      q = 0
-      n.times{|i|
-        ((i+1)...n).each{|j|
-          val = a[i, j].abs
-          if val > max
-            max = val
-            p = i
-            q = j
-          end  }}
-      return p, q
-    end
-
-    #
-    # Compute the cosine-sine pair (c, s) for the element A[p, q]
-    #
-    def Jacobi.sym_schur2(a, p, q)
-      if a[p, q] != 0
-        tau = Float(a[q, q] - a[p, p])/(2 * a[p, q])
-        if tau >= 0
-          t = 1./(tau + Math.sqrt(1 + tau ** 2))
-        else
-          t = -1./(-tau + Math.sqrt(1 + tau ** 2))
-        end
-        c = 1./Math.sqrt(1 + t ** 2)
-        s = t * c
-      else
-        c = 1
-        s = 0
-      end
-      return c, s
-    end
-
-    #
-    # Returns the Jacobi rotation matrix
-    #
-    def Jacobi.J(p, q, c, s, n)
-      j = Matrix.I(n)
-      j[p,p] = c; j[p, q] = s
-      j[q,p] = -s; j[q, q] = c
-      j
-    end
-  end
-
-  #
-  # Classical Jacobi 8.4.3 Golub & van Loan
-  #
-  def cJacobi(tol = 1.0e-10)
-    a = self.clone
-    n = row_size
-    v = Matrix.I(n)
-    eps = tol * a.normF
-    while Jacobi.off(a) > eps
-      p, q = Jacobi.max(a)
-      c, s = Jacobi.sym_schur2(a, p, q)
-      #print "\np:#{p} q:#{q} c:#{c} s:#{s}\n"
-      j = Jacobi.J(p, q, c, s, n)
-      a = j.t * a * j
-      v = v * j
-    end
-    return a, v
-  end
-
-  #
-  # Returns the aproximation matrix computed with Classical Jacobi algorithm.
-  # The aproximate eigenvalues values are in the diagonal of the matrix A.
-  #
-  def cJacobiA(tol = 1.0e-10)
-    cJacobi(tol)[0]
-  end
-
-  #
-  # Returns a Vector with the eigenvalues aproximated values.
-  # The eigenvalues are computed with the Classic Jacobi Algorithm.
-  #
-  def eigenvaluesJacobi
-    a = cJacobiA
-    Vector[*(0...row_size).collect{|i| a[i, i]}]
-  end
-
-  #
-  # Returns the orthogonal matrix obtained with the Jacobi eigenvalue algorithm.
-  # The columns of V are the eigenvector.
-  #
-  def cJacobiV(tol = 1.0e-10)
-    cJacobi(tol)[1]
-  end
 end
 
-
+end