Changeset 456 for library/tests/epdf_harness.cpp

Timestamp:

07/31/09 08:38:18 (15 years ago)

Author:

vbarta

Message:

custom test location for harness tests (extended UnitTest?++), configurable tolerance - all tests pass (most of the time)

Files:

• library/tests/epdf_harness.cpp (modified) (5 diffs)

library/tests/epdf_harness.cpp

@@ -1 +1 @@
 #include "epdf_harness.h"
+#include "base/bdmbase.h"
+#include "base/user_info.h"
 #include "stat/exp_family.h"
 #include "mat_checks.h"
 #include "test_util.h"
 #include "UnitTest++.h"
-
-const double epsilon = 0.00001;
-
-namespace UnitTest
-{
-
-inline void CheckClose(TestResults &results, const itpp::vec &expected,
-                       const itpp::vec &actual, double tolerance,
-                       TestDetails const &details) {
-    if (!AreClose(expected, actual, tolerance)) { 
-        MemoryOutStream stream;
-        stream << "Expected " << expected << " +/- " << tolerance << " but was " << actual;
-
-        results.OnTestFailure(details, stream.GetText());
-    }
-}
-
-inline void CheckClose(TestResults &results, const itpp::mat &expected,
-                       const itpp::mat &actual, double tolerance,
-                       TestDetails const &details) {
-    if (!AreClose(expected, actual, tolerance)) { 
-        MemoryOutStream stream;
-        stream << "Expected " << expected << " +/- " << tolerance << " but was " << actual;
-
-        results.OnTestFailure(details, stream.GetText());
-    }
-}
-
-}
 
 namespace bdm {
@@ -39 +12 @@
 const ParticularUI<epdf_harness> &ParticularUI<epdf_harness>::factory(
     ParticularUI<epdf_harness>("epdf_harness"));
+
+void epdf_harness::test_config(const char *config_file_name) {
+    RV::clear_all();
+
+    UIFile in(config_file_name);
+    Array<epdf_harness *> input;
+    UI::get(input, in, "data");
+    int sz = input.size();
+    CHECK(sz > 0);
+    for (int i = 0; i < sz; ++i) {
+        input(i)->test(config_file_name, i);
+    }
+}
 
 void epdf_harness::from_setting(const Setting &set) {
@@ -64 +50 @@
         UI::get(R, set, "R");
     }
+
+    if (set.exists("tolerance")) {
+        UI::get(tolerance, set, "tolerance");
+    }
 }
 
-void epdf_harness::test()
+void epdf_harness::test(const char *config_name, int idx)
 {
-    CHECK_CLOSE(mean, hepdf->mean(), epsilon);
-    CHECK_CLOSE(variance, hepdf->variance(), epsilon);
+    CurrentContext cc(config_name, idx);
+
+    CHECK_CLOSE_EX(mean, hepdf->mean(), tolerance);
+    CHECK_CLOSE_EX(variance, hepdf->variance(), tolerance);
 
     if (support.rows() == 2) {
@@ -85 +77 @@
         }
 
-        CHECK_CLOSE(mean, num_mean2(hepdf.get(), xb, yb, nbins(0), nbins(1)), 0.1);
-        CHECK_CLOSE(integral, normcoef(hepdf.get(), xb, yb, nbins(0), nbins(1)), 0.1);
+        CHECK_CLOSE_EX(mean, num_mean2(hepdf.get(), xb, yb, nbins(0), nbins(1)), 0.1);
+        CHECK_CLOSE_EX(integral, normcoef(hepdf.get(), xb, yb, nbins(0), nbins(1)), 0.1);
     }
 
@@ -94 +86 @@
         vec Emu = smp * ones(n) / n;
         mat Er = (smp*smp.transpose())/n - outer_product(Emu,Emu);
-        CHECK_CLOSE(mean, Emu, 0.1);
-        CHECK_CLOSE(R, Er, 0.1);
+        CHECK_CLOSE_EX(mean, Emu, tolerance);
+        CHECK_CLOSE_EX(R, Er, tolerance);
     }
 }