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

Timestamp:

08/08/09 13:42:18 (15 years ago)

Author:

smidl

Message:

1st step of mpdf redesign - BROKEN compile

Files:

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

library/bdm/stat/merger.cpp

@@ -152 +152 @@
                         if ( mpdfs ( i )->dimension() == dim ) {
                                 // no need for conditioning or marginalization
-                                lw_src = mpdfs ( i )->e()->evallog_m ( Smp );
+                                lw_src = mpdfs ( i )->evallogcond_m ( Smp , vec(0));
                         } else {
                                 // compute likelihood of marginal on the conditional variable
@@ -190 +190 @@
                                 // Compute likelihood of the partial source
                                 for ( int k = 0; k < Npoints; k++ ) {
-                                        mpdfs ( i )->condition ( dls ( i )->get_cond ( Smp ( k ) ) );
-                                        lw_src ( k ) += mpdfs ( i )->e()->evallog ( dls ( i )->pushdown ( Smp ( k ) ) );
+                                        lw_src ( k ) += mpdfs ( i )->evallogcond ( dls ( i )->pushdown ( Smp ( k ) ),  
+                                                         dls ( i )->get_cond ( Smp ( k ) ));
                                 }