Changeset 799 for library

Timestamp:

01/29/10 22:19:01 (14 years ago)

Author:

smidl

Message:

making testsuite work again

Location:

library

Files:

• bdm/stat/exp_family.h (modified) (1 diff)
• bdm/stat/merger.h (modified) (1 diff)
• tests/testsuite/emix_test.cpp (modified) (4 diffs)
• tests/testsuite/mmix.cfg (modified) (1 diff)

library/bdm/stat/exp_family.h

@@ -1711 +1711 @@
         uptarget.set_rvc ( rvc );
         uptarget.set_parameters ( A, mu1 - A*mu2, R_n );
+        uptarget.validate();
 }
 

library/bdm/stat/merger.h

@@ -188 +188 @@
 
         void validate() {
-                bdm_assert ( eSmp._w().length() > 0, "Empty support, use set_support()." );
-                bdm_assert ( dim == eSmp._samples() ( 0 ).length(), "Support points and rv are not compatible!" );
+//              bdm_assert ( eSmp._w().length() > 0, "Empty support, use set_support()." );
+//              bdm_assert ( dim == eSmp._samples() ( 0 ).length(), "Support points and rv are not compatible!" );
                 bdm_assert ( isnamed(), "mergers must be named" );
         }

library/tests/testsuite/emix_test.cpp

@@ -39 +39 @@
         M1.set_rv ( xy );
         M1._Coms() = A1;
-        M1._w() = 1;
+        M1._w() = vec_1(1.0);
         M1.validate();
 
@@ -70 +70 @@
         M2.set_rv ( xy );
         M2._Coms() = A2;
-        M2._w() = 1;
+        M2._w() = vec_2(.5,.5);
         M2.validate();
 
@@ -76 +76 @@
         CHECK_CLOSE ( 1.0, normcoef ( &M2, vec ( "-3 3 " ), vec ( "-3 3 " ) ), 0.1 );
 
-        int N = 3;
+        int N = 6;
         mat Smp = M2.sample_mat ( N );
 
-        vec exp_ll ( "-5.0 -2.53563 -2.62171" );
+        vec exp_ll ( "-5.0 -2.53563 -2.62171 -5.0 -2.53563 -2.62171" );
         vec ll = M2.evallog_mat ( Smp );
         CHECK_CLOSE ( exp_ll, ll, 5.0 );
 
-        check_mean ( M2, N, mu0, 1.0 );
+        check_mean ( M2, N, 0.5*mu0+0.5*vec("-1.2 -0.1"), 1.0 );
 
         mat observedR ( "0.740142 -0.259015; -0.259015 1.0302" );
@@ -94 +94 @@
 
         // marginal mean
-        CHECK_CLOSE ( vec ( "1.0" ), Mg->mean(), 0.1 );
+        CHECK_CLOSE ( vec ( "0.5" ), Mg->mean(), 0.1 );
 }
 

library/tests/testsuite/mmix.cfg

@@ -26 +26 @@
                 mu = [ 0, 0 ];
                 R = ( "matrix", 2, 2, [ 1.2, 0.3, 0.3, 5.0 ] );
+                rv : 
+                {
+                        class = "RV";
+                        names = ( "{mmixx}" );
+                        sizes = 2;
+                };
     }    
         );