Changeset 693 for library/bdm/stat/merger.cpp

Timestamp:

11/02/09 17:27:29 (15 years ago)

Author:

mido

Message:

mpdf renamed to pdf in the whole library

Files:

• library/bdm/stat/merger.cpp (modified) (5 diffs)

library/bdm/stat/merger.cpp

@@ -5 +5 @@
 namespace bdm {
 
-merger_base::merger_base ( const Array<shared_ptr<mpdf> > &S ):
+merger_base::merger_base ( const Array<shared_ptr<pdf> > &S ):
         Npoints(0), DBG(false), dbg_file(0) {
         set_sources ( S );
@@ -134 +134 @@
 
 
-                        sprintf ( dbg_str, "Mpdf%d", niter );
+                        sprintf ( dbg_str, "pdf%d", niter );
                         for ( int i = 0; i < Npoints; i++ ) {
                                 Mix_pdf ( i ) = Mix.logpred ( Smp_ex.get_col ( i ) );
@@ -145 +145 @@
                 }
                 //Importace weighting
-                for ( int i = 0; i < mpdfs.length(); i++ ) {
+                for ( int i = 0; i < pdfs.length(); i++ ) {
                         lw_src = 0.0;
                         //======== Same RVs ===========
                         //Split according to dependency in rvs
-                        if ( mpdfs ( i )->dimension() == dim ) {
+                        if ( pdfs ( i )->dimension() == dim ) {
                                 // no need for conditioning or marginalization
-                                lw_src = mpdfs ( i )->evallogcond_m ( Smp , vec(0));
+                                lw_src = pdfs ( i )->evallogcond_m ( Smp , vec(0));
                         } else {
                                 // compute likelihood of marginal on the conditional variable
-                                if ( mpdfs ( i )->dimensionc() > 0 ) {
+                                if ( pdfs ( i )->dimensionc() > 0 ) {
                                         // Make marginal on rvc_i
-                                        shared_ptr<epdf> tmp_marg = Mpred->marginal ( mpdfs ( i )->_rvc() );
+                                        shared_ptr<epdf> tmp_marg = Mpred->marginal ( pdfs ( i )->_rvc() );
                                         //compute vector of lw_src
                                         for ( int k = 0; k < Npoints; k++ ) {
-                                                // Here val of tmp_marg = cond of mpdfs(i) ==> calling dls->get_cond
+                                                // Here val of tmp_marg = cond of pdfs(i) ==> calling dls->get_cond
                                                 lw_src ( k ) += tmp_marg->evallog ( dls ( i )->get_cond ( Smp ( k ) ) );
                                         }
@@ -168 +168 @@
                                 }
                                 // Compute likelihood of the missing variable
-                                if ( dim > ( mpdfs ( i )->dimension() + mpdfs ( i )->dimensionc() ) ) {
+                                if ( dim > ( pdfs ( i )->dimension() + pdfs ( i )->dimensionc() ) ) {
                                         ///////////////
-                                        // There are variales unknown to mpdfs(i) : rvzs
-                                        shared_ptr<mpdf> tmp_cond = Mpred->condition ( rvzs ( i ) );
+                                        // There are variales unknown to pdfs(i) : rvzs
+                                        shared_ptr<pdf> tmp_cond = Mpred->condition ( rvzs ( i ) );
                                         // Compute likelihood
                                         vec lw_dbg = lw_src;
@@ -187 +187 @@
                                 // Compute likelihood of the partial source
                                 for ( int k = 0; k < Npoints; k++ ) {
-                                        lw_src ( k ) += mpdfs ( i )->evallogcond ( dls ( i )->pushdown ( Smp ( k ) ),  
+                                        lw_src ( k ) += pdfs ( i )->evallogcond ( dls ( i )->pushdown ( Smp ( k ) ),  
                                                          dls ( i )->get_cond ( Smp ( k ) ));
                                 }