Changeset 504 for library/tests

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

Location:

library/tests

Files:

• emix_test.cpp (modified) (3 diffs)
• merger_2d_test.cpp (modified) (1 diff)
• mixtures_test.cpp (modified) (1 diff)
• testSmp.cpp (modified) (4 diffs)

library/tests/emix_test.cpp

@@ -15 +15 @@
         RV xy = concat ( x, y );
 
-        enorm<ldmat> E1;
-        E1.set_rv ( xy );
+        shared_ptr<enorm<ldmat> > E1 = new enorm<ldmat>();
+        E1->set_rv ( xy );
+        E1->set_parameters ( "1.00054 1.0455" , mat ( "0.740142 -0.259015; -0.259015 1.0302" ) );
 
-        E1.set_parameters ( "1.00054 1.0455" , mat ( "0.740142 -0.259015; -0.259015 1.0302" ) );
-        enorm<ldmat> E2;
-        E2.set_rv ( xy );
-        E2.set_parameters ( "-1.2 -0.1" , mat ( "1 0.4; 0.4 0.5" ) );
+        shared_ptr<enorm<ldmat> > E2 = new enorm<ldmat>();
+        E2->set_rv ( xy );
+        E2->set_parameters ( "-1.2 -0.1" , mat ( "1 0.4; 0.4 0.5" ) );
 
-        Array<epdf*> A1 ( 1 );
-        A1 ( 0 ) = &E1;
+        Array<shared_ptr<epdf> > A1 ( 1 );
+        A1 ( 0 ) = E1;
 
         emix M1;
         M1.set_rv ( xy );
-        M1.set_parameters ( vec ( "1" ), A1, false );
+        M1.set_parameters ( vec ( "1" ), A1 );
 
         // test if ARX and emix with one ARX are the same
-        epdf* Mm = M1.marginal ( y );
-        epdf* Am = E1.marginal ( y );
-        mpdf* Mc = M1.condition ( y );
-        mpdf* Ac = E1.condition ( y );
+        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 );
 
-        mlnorm<ldmat> *wacnd = dynamic_cast<mlnorm<ldmat> *>(Ac);
+        mlnorm<ldmat> *wacnd = dynamic_cast<mlnorm<ldmat> *>( Ac.get() );
         CHECK(wacnd);
         if ( wacnd ) {
@@ -51 +51 @@
 
         // mixture with two components
-        Array<epdf*> A2 ( 2 );
-        A2 ( 0 ) = &E1;
-        A2 ( 1 ) = &E2;
+        Array<shared_ptr<epdf> > A2 ( 2 );
+        A2 ( 0 ) = E1;
+        A2 ( 1 ) = E2;
 
         emix M2;
         M2.set_rv ( xy );
-        M2.set_parameters ( vec ( "1" ), A2, false );
+        M2.set_parameters ( vec ( "1" ), A2 );
 
 
@@ -74 +74 @@
         CHECK_CLOSE ( mat ( "0.740142 -0.259015; -0.259015 1.0302" ), Er, 2.0 );
 
-        epdf *nm2mrg = M2.marginal ( y );
-        CHECK ( nm2mrg );
-        shared_ptr<epdf> Mg ( nm2mrg );
-        mpdf *Cn = M2.condition ( x );
-        CHECK ( Cn );
-
-#if false
-        it_file it ( "emix_test.it" );
-        it << Name ( "Smp" ) << Smp;
-#endif
+        shared_ptr<epdf> Mg = M2.marginal ( y );
+        CHECK ( Mg.get() );
+        shared_ptr<mpdf> Cn = M2.condition ( x );
+        CHECK ( Cn.get() );
 
         // marginal mean
         CHECK_CLOSE ( vec ( "1.0" ), Mg->mean(), 0.1 );
-
-#if false
-        // putting them back together
-        mepdf mMg ( Mg );
-        Array<mpdf*> AA ( 2 );
-        AA ( 0 ) = Cn;
-        AA ( 1 ) = &mMg;
-        mprod mEp ( AA );
-
-        for ( int j = 0; j < N; j++ ) {
-                ll2 ( j ) = mEp.evallogcond ( Smp.get_col ( j ), vec ( 0 ) );
-        }
-        it << Name ( "ll" ) << ll;
-        it << Name ( "ll2" ) << ll2;
-#endif
 }

library/tests/merger_2d_test.cpp

@@ -70 +70 @@
         it << Name ( "S1" ) << f1.evallog_m ( Grid );
         it << Name ( "S2" ) << f2.evallog_m ( Grid );
-        cout << ( ( enorm<ldmat>* ) ( MP->_Coms ( 0 ) ) )->_R().to_mat() << endl;
+        cout << ( ( enorm<ldmat>* ) ( MP->_Coms ( 0 ).get() ) )->_R().to_mat() << endl;
 }

library/tests/mixtures_test.cpp

@@ -53 +53 @@
         fsqmat V2 ( mat ( "2 -0.1; -0.1 2" ) );
 
-        enorm<fsqmat> C1;
-        C1.set_rv ( x );
-        C1.set_parameters ( m1, V1 );
-        enorm<fsqmat> C2;
-        C2.set_rv ( x );
-        C2.set_parameters ( m2, V2 );
+        shared_ptr<enorm<fsqmat> > C1 = new enorm<fsqmat>();
+        C1->set_rv ( x );
+        C1->set_parameters ( m1, V1 );
+        shared_ptr<enorm<fsqmat> > C2 = new enorm<fsqmat>();
+        C2->set_rv ( x );
+        C2->set_parameters ( m2, V2 );
 
-        Array<epdf*> Sim ( 2 );
-        Sim ( 0 ) = &C1;
-        Sim ( 1 ) = &C2;
+        Array<shared_ptr<epdf> > Sim ( 2 );
+        Sim ( 0 ) = C1;
+        Sim ( 1 ) = C2;
         emix Simul;
         Simul.set_rv ( x );
-        Simul.set_parameters ( "0.5 0.6", Sim, false );
+        Simul.set_parameters ( "0.5 0.6", Sim );
 
         // Sample parameters

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;