Changeset 183 for bdm/estim

Timestamp:

10/17/08 10:28:16 (16 years ago)

Author:

smidl

Message:

Universal merging tool is (almost) finished

Files:

• bdm/estim/merger.cpp (modified) (2 diffs)

bdm/estim/merger.cpp

@@ -108 +108 @@
                                         for ( int k= 0; k<Ns; k++ ) {
                                                 smpk=Smp( k );
-                                                tmp_cond->condition ( get_vec ( smpk,zinrvc ) );
-                                                lw_src ( k ) += tmp_cond->_epdf().evalpdflog ( get_vec ( smpk,zinrv ) );
+                                                lw_src ( k ) += log( tmp_cond->evalcond ( get_vec ( smpk,zinrv ), get_vec ( smpk,zinrvc ) ));
                                         }
                                         delete tmp_cond;
@@ -152 +151 @@
                 // ==== stopping rule ===
                 niter++;
-                converged = ( niter>20);
+                converged = ( niter>6);
         }