Changeset 488 for library/tests

Timestamp:

08/08/09 13:43:13 (15 years ago)

Author:

smidl

Message:

changes in mpdf -> compile OK, broken tests!

Location:

library/tests

Files:

• testResample.cpp (modified) (1 diff)
• testSmp.cpp (modified) (2 diffs)
• test_kalman_QR.cpp (modified) (1 diff)
• test_particle.cpp (modified) (1 diff)

library/tests/testResample.cpp

@@ -25 +25 @@
         euni eun;
         eun.set_parameters ( "0", "1" );
-        emp.set_statistics ( ones ( 10 ), &eun );
+        emp.set_statistics ( ones ( 10 ), eun );
         vec &v = emp._w();
         Array<vec> &S = emp._samples();

library/tests/testSmp.cpp

@@ -86 +86 @@
         cout << "======= MMix ======== " << endl;
         mmix mMix;
-        Array<mpdf*> mComs ( 2 );
+        Array<shared_ptr<mpdf> > mComs ( 2 );
         mComs ( 0 ) = &mG;
         eN.set_mu ( vec_2 ( 0.0, 0.0 ) );
@@ -94 +94 @@
 
         Smp = mMix.samplecond_m ( mu0, N );
-        disp ( mMix.e()->mean(), zeros ( 2 ), Smp );
+        disp ( 0.5*eN.mean()+0.4*eG.mean(), zeros ( 2 ), Smp );
 
         cout << "======= EProd ======== " << endl;

library/tests/test_kalman_QR.cpp

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

library/tests/test_particle.cpp

@@ -25 +25 @@
         euni eun;
         eun.set_parameters ( "0", "1" );
-        emp.set_statistics ( ones ( 10 ), &eun );
+        emp.set_statistics ( ones ( 10 ), eun );
         vec &v = emp._w();
         Array<vec> &S = emp._samples();