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

Timestamp:

06/22/09 13:17:49 (15 years ago)

Author:

smidl

Message:

merging works for merger_mx

Files:

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

library/bdm/stat/merger.cpp

@@ -134 +134 @@
                                 {
                                         // no need for conditioning or marginalization
-                                        for ( int j=0;j<Npoints; j++ )   // Smp is Array<> => for cycle
-                                        {
-                                                lw_src ( j ) =mpdfs ( i )->_epdf().evallog ( Smp ( j ) );
-                                        }
+                                        lw_src = mpdfs ( i )->_epdf().evallog_m ( Smp  );
                                 }
                                 else
@@ -219 +216 @@
                         // ==== stopping rule ===
                         niter++;
-                        converged = ( niter>40 );
+                        converged = ( niter>stop_niter );
                 }
                 delete Mpred;