Changeset 725 for library/tests

Timestamp:

11/17/09 00:53:54 (16 years ago)

Author:

smidl

Message:

Sampling from egiw

Location:

library/tests

Files:

• epdf_harness.cpp (modified) (4 diffs)
• testsuite/egiw.cfg (modified) (2 diffs)
• testsuite/epdf_test.cpp (modified) (2 diffs)

library/tests/epdf_harness.cpp

@@ -59 +59 @@
         }
 
-        if ( R.rows() > 0 ) {
+        if ( variance.length() > 0 ) {
                 check_sample_mean();
+        }
+        if (R.rows()>0){
                 check_covariance();
         }
@@ -114 +116 @@
         vec yb = support.get_row ( 1 );
 
-        int tc = 0;
-        Array<vec> actual ( CurrentContext::max_trial_count );
-        do {
-                vec emu = num_mean2 ( hepdf.get(), xb, yb, nbins ( 0 ), nbins ( 1 ) );
-                actual ( tc ) = emu;
-                ++tc;
-        } while ( ( tc < CurrentContext::max_trial_count ) &&
-                  !UnitTest::AreClose ( mean, actual ( tc - 1 ), tolerance ) );
-        if ( ( tc == CurrentContext::max_trial_count ) &&
-                ( !UnitTest::AreClose ( mean, actual ( CurrentContext::max_trial_count - 1 ), tolerance ) ) ) {
-                UnitTest::MemoryOutStream stream;
-                stream << CurrentContext::format_context ( __LINE__ ) << "expected " << mean << " +/- " << tolerance << " but was " << actual;
-
-                UnitTest::TestDetails details ( *UnitTest::CurrentTest::Details(), 0, false );
-
-                UnitTest::CurrentTest::Results()->OnTestFailure ( details, stream.GetText() );
-        }
+        vec actual;
+        actual = num_mean2 ( hepdf.get(), xb, yb, nbins ( 0 ), nbins ( 1 ) );
+
+        CHECK_CLOSE(mean, actual, tolerance);
 }
 
@@ -137 +126 @@
         vec yb = support.get_row ( 1 );
 
-        int tc = 0;
-        Array<double> actual ( CurrentContext::max_trial_count );
-        do {
-                double nc = normcoef ( hepdf.get(), xb, yb, nbins ( 0 ), nbins ( 1 ) );
-                actual ( tc ) = nc;
-                ++tc;
-        } while ( ( tc < CurrentContext::max_trial_count ) &&
-                  !UnitTest::AreClose ( 1.0, actual ( tc - 1 ), tolerance ) );
-        if ( ( tc == CurrentContext::max_trial_count ) &&
-                ( !UnitTest::AreClose ( 1.0, actual ( CurrentContext::max_trial_count - 1 ), tolerance ) ) ) {
-                UnitTest::MemoryOutStream stream;
-                stream << CurrentContext::format_context ( __LINE__ ) << "expected " << mean << " +/- " << tolerance << " but was " << actual;
-
-                UnitTest::TestDetails details ( *UnitTest::CurrentTest::Details(), 0, false );
-
-                UnitTest::CurrentTest::Results()->OnTestFailure ( details, stream.GetText() );
-        }
+        double nc = normcoef ( hepdf.get(), xb, yb, nbins ( 0 ), nbins ( 1 ) );
+        CHECK_CLOSE(1.0,nc,0.01);
 }
 
@@ -168 +142 @@
         } 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 ) ) ) {

library/tests/testsuite/egiw.cfg

@@ -12 +12 @@
     };
   };
-  mean = [ 1.1, 0.1 ];
-  variance = [ 0.01, 8e-05 ];
+  mean = [ 1.1, 0.2 ];
+  variance = [ 0.02, 0.01333 ];
   support = ( "matrix", 2, 2, [ -2.0, 4.0, 0.01, 2.0 ] );
   nbins = [ 100, 200 ];
-  tolerance = 0.2;
+  tolerance = 0.01;
 },
 {
@@ -33 +33 @@
   mean = [2.0, 1.14286];
   variance = [0.0285714, 0.0395795];
+  support = ( "matrix", 2, 2, [ 0.0, 4.0, 0.01, 3.0 ] );
+  nbins = [ 100, 200 ];
+  tolerance = 0.01;
 } );
 

library/tests/testsuite/epdf_test.cpp

@@ -43 +43 @@
 
 TEST ( ewishart_test ) {
-        mat wM = "1.0 0.9; 0.9 1.0";
+        mat wM = "10.0 0.9; 0.9 1.0";
         eWishartCh eW;
         eW.set_parameters ( wM / 100, 100 );
@@ -53 +53 @@
         }
 
-        mat observed ( "0.978486 0.88637; 0.88637 0.992141" );
         mat actual = mea / 100;
-        CHECK_CLOSE ( observed, actual, 0.1 );
+        CHECK_CLOSE ( wM, actual, 0.1 );
 }