Changeset 6ed8c4 in git for kernel/linearAlgebra.h

Timestamp:

Jul 19, 2011, 4:45:41 PM (13 years ago)

Author:

mlee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1f637e0cf55bac728426f222f498b81de378e159

Parents:

bb5c2849ef4e9115c1f69238f0aaf689e2be7e2d

git-author:

mlee <martinlee84@web.de>2011-07-19 16:45:41+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:52:40+01:00

Message:

added const ring to some functions in linearAlgebra.* (TODO complete this)
switched on compatibility layers in numbers.h and polys.h
added nGreater macro to numbers.h
commented out lists in ring.h
moved lists dependend functions from linearAlgebra.* to linearAlgebra.cut

File:

• kernel/linearAlgebra.h (modified) (10 diffs)

kernel/linearAlgebra.h

@@ -50 +50 @@
        matrix &pMat,      /**< [out] the row permutation matrix P   */
        matrix &lMat,      /**< [out] the lower triangular matrix L  */
-       matrix &uMat       /**< [out] the upper row echelon matrix U */
+       matrix &uMat,      /**< [out] the upper row echelon matrix U */
+       const ring r= currRing       /**< [in] current ring */
              );
 
@@ -62 +63 @@
  **/
 int pivotScore(
-               number n  /**< [in] a non-zero matrix entry */
+               number n,    /**< [in] a non-zero matrix entry */
+               const ring r= currRing /**< [in] current ring */
               );
 
@@ -87 +89 @@
            int* bestR,        /**< [out] address of row index of best
                                          pivot element                  */
-           int* bestC         /**< [out] address of column index of
+           int* bestC,        /**< [out] address of column index of
                                          best pivot element             */
+           const ring r= currRing       /**< [in] current ring */
           );
 
@@ -108 +111 @@
 bool luInverse(
                const matrix aMat, /**< [in]  matrix to be inverted */
-               matrix &iMat       /**< [out] inverse of aMat if
+               matrix &iMat,      /**< [out] inverse of aMat if
                                              invertible            */
+               const ring r=currRing /**< [in] current ring */
               );
 
@@ -136 +140 @@
                                      triangular form               */
        matrix &iMat,      /**< [out] inverse of uMat if invertible */
-       bool diagonalIsOne /**< [in]  if true, then all diagonal
+       bool diagonalIsOne,/**< [in]  if true, then all diagonal
                                      entries of uMat are 1         */
+       const ring r= currRing /**< [in] current ring */
                               );
 
@@ -197 +202 @@
        const matrix uMat, /**< [in]  upper right matrix of an LU-
                                      decomposition                */
-       matrix &iMat       /**< [out] inverse of A if invertible   */
+       matrix &iMat,      /**< [out] inverse of A if invertible   */
+       const ring r= currRing
                           );
 
@@ -215 +221 @@
 int luRank(
        const matrix aMat,      /**< [in]  input matrix */
-       const bool isRowEchelon /**< [in]  if true then aMat is assumed to be
+       const bool isRowEchelon,/**< [in]  if true then aMat is assumed to be
                                           already in row echelon form */
+       const ring r= currRing
           );
 
@@ -337 +344 @@
 bool unitMatrix(
        const int n,     /**< [in]  size of the matrix */
-       matrix &unitMat  /**< [out] the new (nxn) unit matrix */
+       matrix &unitMat,  /**< [out] the new (nxn) unit matrix */
+       const ring r= currRing /** [in] current ring */
                );
 
@@ -457 +465 @@
        matrix &pMat,           /**< [out] the transformation matrix */
        matrix &hessenbergMat,  /**< [out] the Hessenberg form of aMat */
-       const number tolerance  /**< [in]  accuracy */
+       const number tolerance, /**< [in]  accuracy */
+       const ring r
                );
 
@@ -484 +493 @@
                   );
 
-/**
- * Computes all eigenvalues of a given real quadratic matrix with
- * multiplicites.
- *
- * The method assumes that the current ground field is the complex numbers.
- * Computations are based on the QR double shift algorithm involving
- * Hessenberg form and householder transformations.
- * If the algorithm works, then it returns a list with two entries which
- * are again lists of the same size:
- * _[1][i] is the i-th mutually distinct eigenvalue that was found,
- * _[2][i] is the (int) multiplicity of _[1][i].
- * If the algorithm does not work (due to an ill-posed matrix), a list with
- * the single entry (int)0 is returned.
- * 'tol1' is used for detection of deflation in the actual qr double shift
- * algorithm.
- * 'tol2' is used for ending Heron's iteration whenever square roots
- * are being computed.
- * 'tol3' is used to distinguish between distinct eigenvalues: When
- * the Euclidean distance between two computed eigenvalues is less then
- * tol3, then they will be regarded equal, resulting in a higher
- * multiplicity of the corresponding eigenvalue.
- *
- * @return a list with one entry (int)0, or two entries which are again lists
- **/
-lists qrDoubleShift(
-       const matrix A,     /**< [in]  the quadratic matrix         */
-       const number tol1,  /**< [in]  tolerance for deflation      */
-       const number tol2,  /**< [in]  tolerance for square roots   */
-       const number tol3   /**< [in]  tolerance for distinguishing
-                                      eigenvalues                  */
-                   );
 
 /**