Changeset 713 for library/tests/pdf_test.cpp

Timestamp:

11/10/09 11:03:09 (15 years ago)

Author:

mido

Message:

_m changed to _mat

emix.cfg prepared, but it is not yet debugged!

Files:

• library/tests/pdf_test.cpp (modified) (6 diffs)

library/tests/pdf_test.cpp

@@ -13 +13 @@
 static void check_covariance(mmix &distrib_obj, const vec &mu0, int nsamples, const mat &R, double tolerance);
 
-TEST ( mepdf_test ) {
-        pdf_harness::test_config ( "mepdf.cfg" );
-}
-
 TEST ( mgamma_test ) {
         pdf_harness::test_config ( "mgamma.cfg" );
@@ -29 +25 @@
 }
 
-// not using pdf_harness because mmix isn't configurable (yet?)
 TEST ( mmix_test ) {
+        pdf_harness::test_config ( "mmix.cfg" );
+        //vec tmu = 0.5 * eN->mean() + 0.5 * mu0;
+
+        /*
         RV x ( "{mmixx }", "2" );
         RV y ( "{mmixy }", "2" );
@@ -63 +62 @@
         mat observedR ( "1.27572 0.778247; 0.778247 3.33129" );
         check_covariance( mMix, mu0, N, observedR, 0.2 );
+*/
 }
 
 // not using pdf_harness because emix isn't configurable (yet?)
-TEST ( mepdf_emix_test ) {
+TEST ( emix_test ) {
+        pdf_harness::test_config ( "emix.cfg" );
+        /*
         int N = 10000; //number of samples
         vec mu0 ( "1.5 1.7" );
@@ -87 +89 @@
         eMix->set_parameters ( vec_2 ( 0.5, 0.5 ), Coms );
         check_mean ( *eMix, mu0, N, eMix->mean(), 0.1 );
+        */
 }
 
@@ -93 +96 @@
         Array<vec> actual(CurrentContext::max_trial_count);
         do {
-                mat smp = distrib_obj.samplecond_m ( mu0, nsamples );
+                mat smp = distrib_obj.samplecond_mat ( mu0, nsamples );
                 vec emu = smp * ones ( nsamples ) / nsamples ;
                 actual( tc ) = emu;
@@ -113 +116 @@
         Array<mat> actual(CurrentContext::max_trial_count);
         do {
-                mat smp = distrib_obj.samplecond_m ( mu0, nsamples );
+                mat smp = distrib_obj.samplecond_mat ( mu0, nsamples );
                 vec emu = smp * ones ( nsamples ) / nsamples ;
                 mat er = ( smp * smp.T() ) / nsamples - outer_product ( emu, emu );