Changeset 529 for library/tests/emix_test.cpp

Timestamp:

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

Author:

vbarta

Message:

defined *_ptr wrappers of shared pointers

Files:

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

library/tests/emix_test.cpp

@@ -1 @@
-#include "shared_ptr.h"
 #include "stat/exp_family.h"
 #include "stat/emix.h"
@@ -20 +19 @@
         vec mu0 ( "1.00054 1.0455" );
 
-        shared_ptr<enorm<ldmat> > E1 = new enorm<ldmat>();
+        enorm_ldmat_ptr E1;
         E1->set_rv ( xy );
         E1->set_parameters ( mu0 , mat ( "0.740142 -0.259015; -0.259015 1.0302" ) );
 
-        shared_ptr<enorm<ldmat> > E2 = new enorm<ldmat>();
+        enorm_ldmat_ptr E2;
         E2->set_rv ( xy );
         E2->set_parameters ( "-1.2 -0.1" , mat ( "1 0.4; 0.4 0.5" ) );
 
-        Array<shared_ptr<epdf> > A1 ( 1 );
+        epdf_array A1 ( 1 );
         A1 ( 0 ) = E1;
 
@@ -36 +35 @@
 
         // test if ARX and emix with one ARX are the same
-        shared_ptr<epdf> Mm = M1.marginal ( y );
-        shared_ptr<epdf> Am = E1->marginal ( y );
-        shared_ptr<mpdf> Mc = M1.condition ( y );
-        shared_ptr<mpdf> Ac = E1->condition ( y );
+        epdf_ptr Mm = M1.marginal ( y );
+        epdf_ptr Am = E1->marginal ( y );
+        mpdf_ptr Mc = M1.condition ( y );
+        mpdf_ptr Ac = E1->condition ( y );
 
         mlnorm<ldmat> *wacnd = dynamic_cast<mlnorm<ldmat> *>( Ac.get() );
@@ -56 +55 @@
 
         // mixture with two components
-        Array<shared_ptr<epdf> > A2 ( 2 );
+        epdf_array A2 ( 2 );
         A2 ( 0 ) = E1;
         A2 ( 1 ) = E2;
@@ -80 +79 @@
         check_covariance ( M2, N, observedR, 2.0);
 
-        shared_ptr<epdf> Mg = M2.marginal ( y );
+        epdf_ptr Mg = M2.marginal ( y );
         CHECK ( Mg.get() );
-        shared_ptr<mpdf> Cn = M2.condition ( x );
+        mpdf_ptr Cn = M2.condition ( x );
         CHECK ( Cn.get() );
 
@@ -90 +89 @@
 
 TEST ( test_emix_2 ) {
-        int N = 10000; //number of samples
+        int N = 10000; // number of samples
         vec mu0 ( "1.5 1.7" );
         mat V0 ( "1.2 0.3; 0.3 5" );
         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 );
 
         emix eMix;
-        Array<shared_ptr<epdf> > Coms ( 2 );
+        epdf_array Coms ( 2 );
         Coms ( 0 ) = eG;
         Coms ( 1 ) = eN;