Changeset 461 for library/tests

Timestamp:

07/31/09 13:06:49 (15 years ago)

Author:

vbarta

Message:

mpdf (& its dependencies) reformat: now using shared_ptr, moved virtual method bodies to .cpp

Location:

library/tests

Files:

• emix_test.cpp (modified) (2 diffs)
• epdf_harness.cpp (modified) (1 diff)
• testSmp.cpp (modified) (1 diff)
• test_kalman_QR.cpp (modified) (1 diff)

library/tests/emix_test.cpp

@@ +1 @@
+#include "shared_ptr.h"
 #include "stat/exp_family.h"
 #include "stat/emix.h"
+
 using namespace bdm;
 
@@ -80 +82 @@
         cout << "original empirical variance: " <<Er <<endl;
 
-        epdf* Mg = (epdf*)M2.marginal ( y );
+        shared_ptr<epdf> Mg(dynamic_cast<epdf *>(M2.marginal(y)));
         mpdf* Cn = (mpdf*)M2.condition ( x );
 

library/tests/epdf_harness.cpp

@@ -80 +80 @@
         mat smp = hepdf->sample_m(nsamples);
         int n = smp.cols();
-        vec Emu = smp * ones(n) / n;
-        mat Er = (smp*smp.transpose())/n - outer_product(Emu,Emu);
-        CHECK_CLOSE_EX(mean, Emu, tolerance);
-        CHECK_CLOSE_EX(R, Er, tolerance);
+        vec emu = smp * ones(n) / n;
+        mat er = (smp * smp.T()) / n - outer_product(emu, emu);
+        CHECK_CLOSE_EX(mean, emu, tolerance);
+        CHECK_CLOSE_EX(R, er, tolerance);
     }
 }

library/tests/testSmp.cpp

@@ -94 +94 @@
         
         Smp = mMix.samplecond_m(mu0,N);
-        disp(mMix._epdf().mean(),zeros(2),Smp);
+        disp(mMix.e()->mean(), zeros(2), Smp);
 
         cout << "======= EProd ======== " << endl;

library/tests/test_kalman_QR.cpp

@@ -64 +64 @@
         KF_QR.set_parameters(&evolQR,&evolQR,100);
         evolQR.condition("1 1 1");
-        KF_QR.set_statistics(evolQR._e(), &KF);
+        KF_QR.set_statistics(evolQR.e(), &KF);
         const epdf& mpost=KF_QR.posterior();
         const epdf& mposttr=KFtr.posterior();