Changeset 453

Timestamp:

07/30/09 09:22:50 (15 years ago)

Author:

vbarta

Message:

moved square_mat children's tests to testsuite

Location:

library/tests

Files:

• CMakeLists.txt (modified) (1 diff)
• chmat_test.cpp (deleted)
• fsqmat_test.cpp (deleted)
• ldmat_test.cpp (deleted)
• square_mat_test.cpp (modified) (3 diffs)
• test0.cpp (deleted)

library/tests/CMakeLists.txt

@@ -10 +10 @@
 target_link_libraries(testutil bdm itpp unittest)
 
-EXEC(chmat_test)
-EXEC(ldmat_test)
-
 add_executable(square_mat_stress square_mat_stress.cpp)
 target_link_libraries(square_mat_stress bdm itpp testutil unittest)
 
-EXEC(fsqmat_test)
 EXEC(emix_test)
-EXEC(test0)
 EXEC(testResample)
 

library/tests/square_mat_test.cpp

@@ -26 +26 @@
 
 template<typename TMatrix>
-void test_square_matrix_minimum(double epsilon) {
+void test_square_matrix(double epsilon) {
     int sz = 3;
     mat A0 = randu(sz, sz);
     mat A = A0 * A0.T();
-
+        
     TMatrix sqmat(A);
     CHECK_EQUAL(sz, sqmat.rows());
@@ -61 +61 @@
     CHECK_CLOSE(r, q, epsilon);
 
+    q = sqmat.invqform(v);
+    r = (invA * v) * v;
+    CHECK_CLOSE(r, q, epsilon);
+
     sqmat2 = sqmat;
     sqmat2.clear();
     CHECK_EQUAL(0, sqmat2.qform(ones(sz)));
-}
 
-template<typename TMatrix>
-void test_square_matrix(double epsilon) {
-    test_square_matrix_minimum<TMatrix>(epsilon);
-
-    int sz = 3;
-    mat A0 = randu(sz, sz);
-    mat A = A0 * A0.T();
-        
-    TMatrix sqmat(A);
     TMatrix twice = sqmat;
     twice += sqmat;
-    mat res(2 * A);
+    res = 2 * A;
     CHECK_CLOSE(res, twice.to_mat(), epsilon);
 
@@ -84 +78 @@
     CHECK_CLOSE(res, twice.to_mat(), epsilon);
 
-    TMatrix sqmat2 = sqmat;
+    sqmat2 = sqmat;
     mat B = randu(sz, sz);
     sqmat2.mult_sym(B);