Changeset 484 for library/tests/mpdf_harness.cpp

Timestamp:

08/07/09 09:57:52 (16 years ago)

Author:

vbarta

Message:

repeating failing mpdf tests; mpdf_harness configs now have optional cond (0 by default) and mandatory variance

Files:

• library/tests/mpdf_harness.cpp (modified) (2 diffs)

library/tests/mpdf_harness.cpp

@@ -28 +28 @@
 void mpdf_harness::from_setting ( const Setting &set ) {
         hmpdf = UI::build<mpdf> ( set, "mpdf", UI::compulsory );
-        UI::get ( cond, set, "cond", UI::compulsory );
         UI::get ( mean, set, "mean", UI::compulsory );
+        UI::get ( variance, set, "variance", UI::compulsory );
+
+        if ( !UI::get ( cond, set, "cond", UI::optional ) ) {
+                cond = zeros ( hmpdf->dimensionc() );
+        }
 
         UI::get ( nsamples, set, "nsamples", UI::optional );
@@ -38 +42 @@
 void mpdf_harness::test ( const char *config_name, int idx ) {
         CurrentContext cc ( config_name, idx );
-
-        mat smp = hmpdf->samplecond_m ( cond, nsamples );
-        int n = smp.cols();
-        vec emu = smp * ones ( n ) / n;
-        mat er = ( smp * smp.T() ) / n - outer_product ( emu, emu );
-        CHECK_CLOSE_EX ( mean, emu, tolerance );
-
+        check_mean();
         if ( R.rows() > 0 ) {
-                CHECK_CLOSE_EX ( R, er, tolerance );
+                check_covariance();
         }
 }
 
+void mpdf_harness::check_mean() {
+        vec delta = make_close_tolerance ( variance, nsamples );
+
+        int tc = 0;
+        Array<vec> actual(CurrentContext::max_trial_count);
+        do {
+                mat smp = hmpdf->samplecond_m ( cond, nsamples );
+                vec emu = smp * ones ( nsamples ) / nsamples;
+                actual( tc ) = emu;
+                ++tc;
+        } while ( ( tc < CurrentContext::max_trial_count ) &&
+                  !UnitTest::AreClose ( mean, actual( tc - 1 ), delta ) );
+        if ( ( tc == CurrentContext::max_trial_count ) &&
+             ( !UnitTest::AreClose ( mean, actual( CurrentContext::max_trial_count - 1 ), delta ) ) ) {
+                UnitTest::MemoryOutStream stream;
+                stream << CurrentContext::format_context(__LINE__) << "expected " << mean << " +/- " << delta << " but was " << actual;
+
+                UnitTest::TestDetails details(*UnitTest::CurrentTest::Details(), 0, false);
+
+                UnitTest::CurrentTest::Results()->OnTestFailure ( details, stream.GetText() );
+       }
 }
+
+void mpdf_harness::check_covariance() {
+        int tc = 0;
+        Array<mat> actual(CurrentContext::max_trial_count);
+        do {
+                mat smp = hmpdf->samplecond_m ( cond, nsamples );
+                vec emu = smp * ones ( nsamples ) / nsamples;
+                mat er = ( smp * smp.T() ) / nsamples - outer_product ( emu, emu );
+                actual( tc ) = er;
+                ++tc;
+        } while ( ( tc < CurrentContext::max_trial_count ) &&
+                  !UnitTest::AreClose ( R, actual( tc - 1 ), tolerance ) );
+        if ( ( tc == CurrentContext::max_trial_count ) &&
+             ( !UnitTest::AreClose ( R, actual( CurrentContext::max_trial_count - 1 ), tolerance ) ) ) {
+                UnitTest::MemoryOutStream stream;
+                stream << CurrentContext::format_context(__LINE__) << "expected " << R << " +/- " << tolerance << " but was " << actual;
+
+                UnitTest::TestDetails details(*UnitTest::CurrentTest::Details(), 0, false);
+
+                UnitTest::CurrentTest::Results()->OnTestFailure ( details, stream.GetText() );
+       }
+}
+
+}