Changeset 211 for bdm/estim/merger.cpp
- Timestamp:
- 11/13/08 20:00:53 (16 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
bdm/estim/merger.cpp
r205 r211 102 102 // no need for conditioning or marginalization 103 103 for ( int j=0;j<Ns; j++ ) { // Smp is Array<> => for cycle 104 lw_src ( j ) =mpdfs ( i )->_epdf().eval pdflog ( Smp ( j ) );104 lw_src ( j ) =mpdfs ( i )->_epdf().evallog ( Smp ( j ) ); 105 105 } 106 106 } … … 113 113 for ( int k=0;k<Ns;k++ ) { 114 114 // Here val of tmp_marg = cond of mpdfs(i) ==> calling dls->get_cond 115 lw_src ( k ) += tmp_marg->eval pdflog ( dls ( i )->get_cond ( Smp ( k ) ) );115 lw_src ( k ) += tmp_marg->evallog ( dls ( i )->get_cond ( Smp ( k ) ) ); 116 116 } 117 117 delete tmp_marg; … … 130 130 for ( int k= 0; k<Ns; k++ ) { 131 131 lw_src ( k ) += log ( 132 tmp_cond->eval cond (132 tmp_cond->evallogcond ( 133 133 zdls ( i )->get_val ( Smp ( k ) ), 134 134 zdls ( i )->get_cond ( Smp ( k ) ) ) ); … … 142 142 for ( int k= 0; k<Ns; k++ ) { 143 143 mpdfs ( i )->condition ( dls ( i )->get_cond ( Smp ( k ) ) ); 144 lw_src ( k ) += mpdfs ( i )->_epdf().eval pdflog ( dls ( i )->get_val ( Smp ( k ) ) );144 lw_src ( k ) += mpdfs ( i )->_epdf().evallog ( dls ( i )->get_val ( Smp ( k ) ) ); 145 145 } 146 146