Changeset 427

Timestamp:

07/24/09 08:53:22 (15 years ago)

Author:

vbarta

Message:

deriving ldmat publically (like all other children of square_mat); more tests

Location:

library

Files:

• bdm/math/square_mat.h (modified) (5 diffs)
• tests/square_mat_test.cpp (modified) (2 diffs)

library/bdm/math/square_mat.h

@@ -31 +31 @@
 mat ltuinv( const mat &L );
 
-/*! \brief Virtual class for representation of double symmetric matrices in square-root form.
+/*! \brief Abstract class for representation of double symmetric matrices in square-root form.
 
 All operations defined on this class should be optimized for the chosen decomposition.
@@ -97 +97 @@
                 int cols() const {return dim;};
 
-                //! Reimplementing common functions of mat: cols().
+                //! Reimplementing common functions of mat: rows().
                 int rows() const {return dim;};
 
@@ -187 +187 @@
 All inplace operations modifies only these and the need to compose and decompose the matrix is avoided.
 */
-class ldmat: sqmat
+class ldmat: public sqmat
 {
         public:
@@ -218 +218 @@
                 double invqform (const vec &v ) const;
                 void clear();
-                int cols() const;
-                int rows() const;
                 vec sqrt_mult ( const vec &v ) const;
 
@@ -284 +282 @@
 //!mapping of negative add operation to operators
 inline ldmat& ldmat::operator -= ( const ldmat &ldA )  {this->add ( ldA,-1.0 );return *this;}
-//!access function
-inline int ldmat::cols() const {return dim;}
-//!access function
-inline int ldmat::rows() const {return dim;}
 
 /*! @} */

library/tests/square_mat_test.cpp

@@ -32 +32 @@
 
     TMatrix sqmat(A);
+    CHECK_EQUAL(sz, sqmat.rows());
+    CHECK_EQUAL(sz, sqmat.cols());
+
     mat res = sqmat.to_mat();
     CHECK_CLOSE(A, res, epsilon);
@@ -45 +48 @@
     double d = det(A);
     CHECK_CLOSE(log(d), sqmat.logdet(), epsilon);
+
+    double q = sqmat.qform(ones(sz));
+    CHECK_CLOSE(sumsum(A), q, epsilon);
+
+    q = sqmat.qform(v);
+    double r = (A * v) * v;
+    CHECK_CLOSE(r, q, epsilon);
+
+    sqmat2 = sqmat;
+    sqmat2.clear();
+    CHECK_EQUAL(0, sqmat2.qform(ones(sz)));
 }