Changeset 504 for library/tests/testSmp.cpp

Timestamp:

08/12/09 09:27:40 (15 years ago)

Author:

vbarta

Message:

returning shared pointers from epdf::marginal & epdf::condition; testsuite run leaks down from 8402 to 6510 bytes

Files:

• library/tests/testSmp.cpp (modified) (4 diffs)

library/tests/testSmp.cpp

@@ -32 +32 @@
 
         cout << "====== ENorm ====== " << endl;
-        enorm<ldmat> eN;
-        eN.set_parameters ( mu0, R );
-        mat Smp = eN.sample_m ( N );
+        shared_ptr<enorm<ldmat> > eN = new enorm<ldmat>();
+        eN->set_parameters ( mu0, R );
+        mat Smp = eN->sample_m ( N );
 
         disp ( mu0, R.to_mat(), Smp );
@@ -49 +49 @@
         vec a = "100000,10000";
         vec b = a / 10.0;
-        egamma eG;
-        eG.set_parameters ( a, b );
+        shared_ptr<egamma> eG = new egamma();
+        eG->set_parameters ( a, b );
 
-        cout << eG.evallog ( a ) << endl;
-        Smp = eG.sample_m ( N );
+        cout << eG->evallog ( a ) << endl;
+        Smp = eG->sample_m ( N );
 
         vec g_mu = elem_div ( a, b );
@@ -60 +60 @@
 
         cout << "====== MGamma ====== " << endl;
-        mgamma mG;
+        shared_ptr<mgamma> mG = new mgamma();
         double k = 10.0;
-        mG.set_parameters ( k, mu0 );
+        mG->set_parameters ( k, mu0 );
 
-        Smp = mG.samplecond_m ( mu0, N );
+        Smp = mG->samplecond_m ( mu0, N );
         disp ( mu0, pow ( mu0, 2.0 ) / k, Smp );
 
         cout << "======= EMix ======== " << endl;
-        emix eMix;
-        Array<epdf*> Coms ( 2 );
-        Coms ( 0 ) = &eG;
-        Coms ( 1 ) = &eN;
+        shared_ptr<emix> eMix = new emix();
+        Array<shared_ptr<epdf> > Coms ( 2 );
+        Coms ( 0 ) = eG;
+        Coms ( 1 ) = eN;
 
-        eMix.set_parameters ( vec_2 ( 0.5, 0.5 ), Coms );
-        vec smp = eMix.sample();
-        Smp = eMix.sample_m ( N );
-        disp ( eMix.mean(), zeros ( 2 ), Smp );
+        eMix->set_parameters ( vec_2 ( 0.5, 0.5 ), Coms );
+        vec smp = eMix->sample();
+        Smp = eMix->sample_m ( N );
+        disp ( eMix->mean(), zeros ( 2 ), Smp );
 
         cout << "======= MEpdf ======== " << endl;
-        mepdf meMix ( &eMix );
+        mepdf meMix ( eMix );
 
         Smp = meMix.samplecond_m ( mu0, N );
-        disp ( eMix.mean(), zeros ( 2 ), Smp );
+        disp ( eMix->mean(), zeros ( 2 ), Smp );
 
         cout << "======= MMix ======== " << endl;
         mmix mMix;
         Array<shared_ptr<mpdf> > mComs ( 2 );
-        mComs ( 0 ) = &mG;
-        eN.set_mu ( vec_2 ( 0.0, 0.0 ) );
-        mepdf mEnorm ( &eN );
-        mComs ( 1 ) = &mEnorm;
+
+        // emix::set_parameters requires the first mpdf to be named
+        mG->set_rv(x);
+        mG->set_rvc(y);
+        mComs ( 0 ) = mG;
+
+        eN->set_mu ( vec_2 ( 0.0, 0.0 ) );
+        shared_ptr<mepdf> mEnorm = new mepdf ( eN );
+        mComs ( 1 ) = mEnorm;
         mMix.set_parameters ( vec_2 ( 0.5, 0.5 ), mComs );
 
         Smp = mMix.samplecond_m ( mu0, N );
-        disp ( 0.5*eN.mean()+0.4*eG.mean(), zeros ( 2 ), Smp );
+        disp ( 0.5 * eN->mean() + 0.4 * eG->mean(), zeros ( 2 ), Smp );
 
         cout << "======= EProd ======== " << endl;
-        // we have to change eG.rv to y
-        eN.set_rv ( x );
-        eG.set_rv ( y );
+        // we have to change eG->rv to y
+        eN->set_rv ( x );
+        eG->set_rv ( y );
         //create array
         Array<mpdf*> A ( 2 );
-        mepdf meN ( &eN );
-        mepdf meG ( &eG );
+        mepdf meN ( eN.get() );
+        mepdf meG ( eG.get() );
         A ( 0 ) = &meN;
         A ( 1 ) = &meG;
@@ -114 +119 @@
         vec v0 = vec ( 0 );
         Smp = eP.samplecond ( v0, N );
-        disp ( concat ( eN.mean(), eG.mean() ), epV, Smp );
+        disp ( concat ( eN->mean(), eG->mean() ), epV, Smp );
 
         cout << "======= eWishart ======== " << endl;