Changeset 468

Timestamp:

08/04/09 08:29:50 (15 years ago)

Author:

vbarta

Message:

added supplementary random test data to agenda

Location:

library/tests

Files:

• CMakeLists.txt (modified) (1 diff)
• square_mat_point.cpp (added)
• square_mat_point.h (added)
• square_mat_prep.cpp (modified) (4 diffs)
• square_mat_stress.cpp (modified) (8 diffs)

library/tests/CMakeLists.txt

@@ -7 +7 @@
 link_directories (./unittest-cpp)
 
-add_library(testutil egiw_harness.cpp egiw_harness.h epdf_harness.cpp epdf_harness.h mat_checks.cpp mat_checks.h mpdf_harness.cpp mpdf_harness.h test_util.cpp test_util.h)
+add_library(testutil egiw_harness.cpp egiw_harness.h epdf_harness.cpp epdf_harness.h mat_checks.cpp mat_checks.h mpdf_harness.cpp mpdf_harness.h square_mat_point.cpp square_mat_point.h test_util.cpp test_util.h)
 target_link_libraries(testutil bdm itpp unittest)
 

library/tests/square_mat_prep.cpp

@@ -4 +4 @@
 #include "additive_generator.h"
 #include "size_generator.h"
+#include "square_mat_point.h"
 #include <iostream>
 #include <iomanip>
@@ -15 +16 @@
 UIREGISTER(size_generator);
 UIREGISTER(additive_generator);
+UIREGISTER(square_mat_point);
 
 const char *generator_file_name = "generator.cfg";
@@ -60 +62 @@
         cerr << "usage: " << argv[0] << " [ -g generator.cfg ] [ -a agenda_output.cfg ] [ -l agenda_length ]" << endl;
     } else {
-        Array<mat> mag(agenda_length);
+        Array<square_mat_point *> mag(agenda_length);
 
         UIFile gspec(generator_file_name);
         auto_ptr<generator> gen(UI::build<generator>(gspec, "generator"));
         for (int i = 0; i < agenda_length; ++i) {
-            mag(i) = gen->next();
+            mat m = gen->next();
+            square_mat_point *p = new square_mat_point();
+            p->set_parameters(m, randu(m.rows()), randu());
+            mag(i) = p;
         }
 
@@ -71 +76 @@
         UI::save(mag, fag, "agenda");
         fag.save(agenda_file_name);
+
+        for (int i = 0; i < agenda_length; ++i) {
+            square_mat_point *p = mag(i);
+            mag(i) = 0;
+            delete p;
+        }
     }
 }

library/tests/square_mat_stress.cpp

@@ -2 +2 @@
 #include "../bdm/math/chmat.h"
 #include "base/user_info.h"
+#include "square_mat_point.h"
 #include "UnitTest++.h"
 #include "TestReporterStdout.h"
@@ -19 +20 @@
 double epsilon = 0.00001;
 bool fast = false;
+
+namespace bdm {
+UIREGISTER(square_mat_point);
+}
 
 namespace UnitTest
@@ -44 +49 @@
 }
 
+typedef void (*FTestMatrix)(int, square_mat_point *);
+
 template<typename TMatrix>
-void test_matrix(int index, const mat &A) {
+void test_matrix(int index, square_mat_point *point) {
     Real_Timer tt;
         
-    cout << "agenda[" << index << ']' << endl;
+    cout << "agenda[" << index << "]:" << endl;
+    mat A = point->get_matrix();
     int sz = A.rows();
     CHECK_EQUAL(A.cols(), sz);
@@ -67 +75 @@
     cout << "to_mat: " << elapsed << " s" << endl;
 
-    vec v = randu(sz);
-    double w = randu();
+    vec v = point->get_vector();
+    double w = point->get_scalar();
     TMatrix sqmat2 = sqmat;
         
@@ -88 +96 @@
     elapsed = tt.toc();
 
-    if (!fast) {
-        mat invA = inv(A);
+    mat invA;
+    if (!fast) {
+        invA = inv(A);
         CHECK_CLOSE(invA, invmat.to_mat(), epsilon);
     }
@@ -105 +114 @@
 
     cout << "logdet: " << elapsed << " s" << endl;
-}
-
-template<typename TMatrix>
-void test_agenda() {
+
+    tt.tic();
+    double q = sqmat.qform(ones(sz));
+    elapsed = tt.toc();
+
+    if (!fast) {
+        CHECK_CLOSE(sumsum(A), q, epsilon);
+    }
+
+    cout << "qform(1): " << elapsed << " s" << endl;
+
+    tt.tic();
+    q = sqmat.qform(v);
+    elapsed = tt.toc();
+
+    if (!fast) {
+        double r = (A * v) * v;
+        CHECK_CLOSE(r, q, epsilon);
+    }
+
+    cout << "qform(v): " << elapsed << " s" << endl;
+
+    tt.tic();
+    q = sqmat.invqform(v);
+    elapsed = tt.toc();
+
+    if (!fast) {
+        double r = (invA * v) * v;
+        CHECK_CLOSE(r, q, epsilon);
+    }
+
+    cout << "invqform: " << elapsed << " s" << endl;
+
+    TMatrix twice = sqmat;
+
+    tt.tic();
+    twice += sqmat;
+    elapsed = tt.toc();
+
+    if (!fast) {
+        res = 2 * A;
+        CHECK_CLOSE(res, twice.to_mat(), epsilon);
+    }
+
+    cout << "+=: " << elapsed << " s" << endl;
+
+    sqmat2 = sqmat;
+
+    tt.tic();
+    sqmat2.mult_sym(A);
+    elapsed = tt.toc();
+
+    if (!fast) {
+        res = (A * A) * A.T();
+        CHECK_CLOSE(res, sqmat2.to_mat(), epsilon);
+    }
+
+    cout << "^2: " << elapsed << " s" << endl;
+}
+
+void test_agenda(FTestMatrix test) {
     UIFile fag(agenda_file_name);
-    Array<mat> mag;
+    Array<square_mat_point *> mag;
     UI::get(mag, fag, "agenda");
     int sz = mag.size();
     CHECK(sz > 0);
     for (int i = 0; i < sz; ++i) {
-        test_matrix<TMatrix>(i, mag(i));
+        test(i, mag(i));
+    }
+
+    for (int i = 0; i < sz; ++i) {
+        square_mat_point *p = mag(i);
+        mag(i) = 0;
+        delete p;
     }
 }
 
 SUITE(ldmat) {
-    TEST(cycle) {
-        test_agenda<ldmat>();
+    TEST(agenda) {
+        test_agenda(test_matrix<ldmat>);
     }
 }
 
 SUITE(fsqmat) {
-    TEST(cycle) {
-        test_agenda<fsqmat>();
+    TEST(agenda) {
+        test_agenda(test_matrix<fsqmat>);
     }
 }
 
 SUITE(chmat) {
-    TEST(cycle) {
-        test_agenda<chmat>();
+    TEST(agenda) {
+        test_agenda(test_matrix<chmat>);
     }
 }
@@ -159 +231 @@
             update_next = 0;
         } else {
-            if (!strcmp(*param, "-c")) {
+            if (!strcmp(*param, "-a")) {
+                update_next = 3;
+            } else if (!strcmp(*param, "-c")) {
                 update_next = 1;
             } else if (!strcmp(*param, "-e")) {
@@ -174 +248 @@
 
     if (unknown || update_next) {
-        cerr << "usage: " << argv[0] << " [ -f ] [ -e epsilon ] [ -c class ]" << endl;
+        cerr << "usage: " << argv[0] << " [ -f ] [ -e epsilon ] [ -a agenda_input.cfg ] [ -c class ]" << endl;
     } else {
         UnitTest::TestReporterStdout reporter;