Changeset 504 for library/bdm/stat/merger.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/bdm/stat/merger.cpp (modified) (4 diffs)

library/bdm/stat/merger.cpp

@@ -157 +157 @@
                                 if ( mpdfs ( i )->dimensionc() > 0 ) {
                                         // Make marginal on rvc_i
-                                        epdf* tmp_marg = Mpred->marginal ( mpdfs ( i )->_rvc() );
+                                        shared_ptr<epdf> tmp_marg = Mpred->marginal ( mpdfs ( i )->_rvc() );
                                         //compute vector of lw_src
                                         for ( int k = 0; k < Npoints; k++ ) {
@@ -163 +163 @@
                                                 lw_src ( k ) += tmp_marg->evallog ( dls ( i )->get_cond ( Smp ( k ) ) );
                                         }
-                                        delete tmp_marg;
 
 //                                      sprintf ( str,"marg%d",niter );
@@ -173 +172 @@
                                         ///////////////
                                         // There are variales unknown to mpdfs(i) : rvzs
-                                        mpdf* tmp_cond = Mpred->condition ( rvzs ( i ) );
+                                        shared_ptr<mpdf> tmp_cond = Mpred->condition ( rvzs ( i ) );
                                         // Compute likelihood
                                         vec lw_dbg = lw_src;
@@ -186 +185 @@
                                                 }
                                         }
-                                        delete tmp_cond;
                                 }
                                 // Compute likelihood of the partial source