Changeset 1189 for library/tests

Timestamp:

09/16/10 13:22:11 (14 years ago)

Author:

smidl

Message:

new tests of egiw

Location:

library/tests

Files:

• epdf_harness.cpp (modified) (2 diffs)
• epdf_harness.h (modified) (1 diff)
• testsuite/egiw.cfg (modified) (4 diffs)
• testsuite/egiw_support_gen.m (added)
• testsuite/epdf_test.cpp (modified) (1 diff)
• testsuite/rectangular_support_test.cpp (modified) (1 diff)

library/tests/epdf_harness.cpp

@@ -28 +28 @@
     UI::get ( variance, set, "variance", UI::compulsory );
 
-    support = UI::build<rectangular_support> ( set, "support", UI::optional );
+    support = UI::build<support_base> ( set, "support", UI::optional );
     UI::get ( nsamples, set, "nsamples", UI::optional );
     UI::get ( R, set, "R", UI::optional );
@@ -45 +45 @@
     if ( support ) { // support is given
         grid_fnc ep_disc;
-        ep_disc.set_support ( *support );
+        ep_disc.set_support ( support );
         ep_disc.set_values ( *hepdf );
         // ep_disc is discretized at support points
 
-        double point_volume = prod ( support->_steps() );
-        CHECK_CLOSE ( 1.0, sum ( ep_disc._values() ) *point_volume, 0.01 );
+        CHECK_CLOSE ( 1.0,  ep_disc.integrate(), 0.01 );
 
         vec pdf = ep_disc._values();

library/tests/epdf_harness.h

@@ -29 +29 @@
     vec mean;
     vec variance;
-    shared_ptr<rectangular_support> support;
+    shared_ptr<support_base> support;
     int nsamples;
     mat R;

library/tests/testsuite/egiw.cfg

@@ -5 +5 @@
     class = "egiw";
     fV = ( "matrix", 2, 2, [ 13.1, 11.0, 11.0, 10.0 ] );
+// m=1.1; var_e = 0.1;
     nu = 10.0;
     dimx = 1;
@@ -28 +29 @@
     class = "egiw";
     fV = ( "matrix", 2, 2, [ 200.0, 80.0, 80.0, 40.0 ] );
+        // m=2; var_e = 1;
     nu = 40.0;
     dimx = 1;
@@ -45 +47 @@
         };
   tolerance = 0.01;
-});
-
-
-broken = 
+},
 {
   class = "epdf_harness";
   epdf = {
     class = "egiw";
-    V = ( "matrix", 2, 2, [ 10.0, 5.0, 5.0, 15.0 ] );
-    nu = 10.0;
+    fV = ( "matrix", 2, 2, [ 10.0, 5.0, 5.0, 15.0 ] );
+    nu = 16.0;
     dimx = 2;
     rv : 
@@ -62 +61 @@
     };
   };
-  mean = [1.0, 0.5, 0.5, 1.5];
-  variance = [1.0, 1.0];
-  R = ( "matrix", 2, 2, [ 1.0, 0.0, 0.0, 1.0 ] );
+  mean = [1.0, 0.5, 0.5, 1.5];// V/(delta-2-1)=V/(nu-2-1-2-1)
+  variance = [0.2500, 0.2045, 0.2045, 0.5625]; // m=13; var(i,j)=(12Vij^2+10Vii*Vjj)/(11*100*8)
+  R = ("matrix",4,4,[0.2500, 0.0, 0.0, 0.0, 0.0, 0.2045, 0.0, 0.0, 0.0, 0.0, 0.2045, 0.0, 0.0, 0.0, 0.0, 0.5625]); 
   support = {
-        class = "rectangular_support";
-        ranges = ( [ 0.0, 4.0 ], [-2.0, 2.0], [-2.0, 2.0], [0.0, 4.0 ] );
-        gridsizes = [ 10, 10, 10, 10];
+        class = "discrete_support";
+        points = "s@egiw_support.cfg";
+        volumes = "v@egiw_support.cfg";
         };
-  tolerance = 0.01;
-};
+  tolerance = 0.03;
+}
+);

library/tests/testsuite/epdf_test.cpp

@@ -53 +53 @@
     mat wM = "1.1 0.9; 0.9 1.0";
     eWishartCh eW;
-    eW.set_parameters ( wM / 100, 100 );
+    eW.set_parameters ( wM , 10 );
     eW.validate();
     mat mea = zeros ( 2, 2 );
-    mat Ch;
+    chmat Ch;
     for ( int i = 0; i < 100; i++ ) {
         Ch = eW.sample_mat();
-        mea += Ch.T() * Ch;
+        mea += Ch.to_mat();
     }
 
     mat actual = mea / 100;
-    CHECK_CLOSE ( wM, actual, 0.1 );
+    CHECK_CLOSE ( 10*wM, actual, 0.3 );
 }
 

library/tests/testsuite/rectangular_support_test.cpp

@@ -9 +9 @@
 TEST ( rectangular_support_test ) {
     rectangular_support rs;
-    CHECK_EQUAL ( rs.first_vec(), vec ( 0 ) );
+    //CHECK_EQUAL ( rs.first_vec(), vec ( 0 ) );
 
     Array<vec> range ( 2 );