Changeset 529 for library/tests/mpdf_test.cpp

Timestamp:

08/14/09 09:03:02 (15 years ago)

Author:

vbarta

Message:

defined *_ptr wrappers of shared pointers

Files:

• library/tests/mpdf_test.cpp (modified) (3 diffs)

library/tests/mpdf_test.cpp

@@ -38 +38 @@
         ldmat R = ldmat ( V0 );
 
-        shared_ptr<enorm<ldmat> > eN = new enorm<ldmat>();
+        enorm_ldmat_ptr eN;
         eN->set_parameters ( mu0, R );
 
-        shared_ptr<mgamma> mG = new mgamma();
+        mgamma_ptr mG;
         double k = 10.0;
         mG->set_parameters ( k, mu0 );
 
         mmix mMix;
-        Array<shared_ptr<mpdf> > mComs ( 2 );
+        mpdf_array mComs ( 2 );
 
         // mmix::set_parameters requires the first mpdf to be named
@@ -54 +54 @@
 
         eN->set_mu ( vec_2 ( 0.0, 0.0 ) );
-        shared_ptr<mepdf> mEnorm = new mepdf ( eN );
+        mepdf_ptr mEnorm = new mepdf ( eN );
         mComs ( 1 ) = mEnorm;
 
         mMix.set_parameters ( vec_2 ( 0.5, 0.5 ), mComs );
 
-        double tolerance = 0.1;
-
         vec tmu = 0.5 * eN->mean() + 0.5 * mu0;
-        check_mean ( mMix, mu0, N, tmu, tolerance );
+        check_mean ( mMix, mu0, N, tmu, 0.1 );
 
         mat observedR ( "1.27572 0.778247; 0.778247 3.33129" );
-        check_covariance( mMix, mu0, N, observedR, tolerance);
+        check_covariance( mMix, mu0, N, observedR, 0.2 );
 }
 
@@ -75 +73 @@
         ldmat R = ldmat ( V0 );
 
-        shared_ptr<enorm<ldmat> > eN = new enorm<ldmat>();
+        enorm_ldmat_ptr eN;
         eN->set_parameters ( mu0, R );
 
         vec a = "100000,10000";
         vec b = a / 10.0;
-        shared_ptr<egamma> eG = new egamma();
+        egamma_ptr eG;
         eG->set_parameters ( a, b );
 
-        shared_ptr<emix> eMix = new emix();
-        Array<shared_ptr<epdf> > Coms ( 2 );
+        emix_ptr eMix;
+        epdf_array Coms ( 2 );
         Coms ( 0 ) = eG;
         Coms ( 1 ) = eN;