Changeset 504 for library/tests/emix_test.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/emix_test.cpp (modified) (3 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
 }