Changeset 465

Timestamp:

08/03/09 08:09:16 (16 years ago)

Author:

vbarta

Message:

computing mean tolerance from variance

Location:

library/tests

Files:

• epdf_harness.cpp (modified) (1 diff)
• mat_checks.cpp (modified) (1 diff)
• mat_checks.h (modified) (5 diffs)

library/tests/epdf_harness.cpp

@@ -88 +88 @@
         vec emu = smp * ones(n) / n;
         mat er = (smp * smp.T()) / n - outer_product(emu, emu);
-        CHECK_CLOSE_EX(mean, emu, tolerance);
+
+        vec delta = sqrt(variance) / sqrt(nsamples);
+        CHECK_CLOSE_EX(mean, emu, delta);
+
         CHECK_CLOSE_EX(R, er, tolerance);
     }

library/tests/mat_checks.cpp

@@ -12 +12 @@
     for (int i = 0; i < expected.length(); ++i) {
         if (!AreClose(expected(i), actual(i), tolerance)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool AreClose(const itpp::vec &expected, const itpp::vec &actual,
+              const itpp::vec &tolerance) {
+    if ((expected.length() != actual.length()) ||
+        (actual.length() != tolerance.length())) {
+        return false;
+    }
+
+    for (int i = 0; i < expected.length(); ++i) {
+        if (!AreClose(expected(i), actual(i), tolerance(i))) {
             return false;
         }

library/tests/mat_checks.h

@@ -22 +22 @@
 bool AreClose(const itpp::vec &expected, const itpp::vec &actual,
               double tolerance);
+
+bool AreClose(const itpp::vec &expected, const itpp::vec &actual,
+              const itpp::vec &tolerance);
 
 bool AreClose(const itpp::mat &expected, const itpp::mat &actual,
@@ -50 +53 @@
 }
 
-/*! CHECK_CLOSE_EX macro should be used only in blocks having an
-  instance of this class (which sets the globals for error
-  reporting). */
+/*! CHECK_EQUAL_EX and CHECK_CLOSE_EX macros should be used only in
+  blocks having an instance of this class (which sets the globals for
+  error reporting). */
 class CurrentContext
 {
@@ -64 +67 @@
     ~CurrentContext();
 
-    template< typename Expected, typename Actual, typename Tolerance >
+    template<typename Expected, typename Actual>
+    static void CheckEqualEx(UnitTest::TestResults& results,
+                             Expected const& expected,
+                             Actual const& actual,
+                             UnitTest::TestDetails const& details) {
+        if (!(expected == actual)) {
+            UnitTest::MemoryOutStream stream;
+            stream << "error at " << config_name << '[' << index << "]: expected " << expected << " but was " << actual;
+
+            results.OnTestFailure(details, stream.GetText());
+        }
+    }
+
+    template<typename Expected, typename Actual, typename Tolerance>
     static void CheckCloseEx(UnitTest::TestResults& results,
                              Expected const& expected,
@@ -79 +95 @@
 };
 
+#define CHECK_EQUAL_EX(expected, actual) \
+    do \
+    { \
+        try { \
+            CurrentContext::CheckEqualEx(*UnitTest::CurrentTest::Results(), expected, actual, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), 0, false)); \
+        } \
+        catch (...) { \
+            UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__), \
+                    "Unhandled exception in CHECK_EQUAL_EX(" #expected ", " #actual ")"); \
+        } \
+    } while (0)
+
+
 #define CHECK_CLOSE_EX(expected, actual, tolerance) \
     do \
@@ -87 +116 @@
         catch (...) { \
             UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__), \
-                    "Unhandled exception in CHECK_CLOSE(" #expected ", " #actual ")"); \
+                    "Unhandled exception in CHECK_CLOSE_EX(" #expected ", " #actual ")"); \
         } \
     } while (0)