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

Timestamp:

11/25/09 12:14:38 (15 years ago)

Author:

mido

Message:

ASTYLER RUN OVER THE WHOLE LIBRARY, JUPEE

Files:

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

library/bdm/stat/merger.cpp

@@ -5 +5 @@
 namespace bdm {
 
-merger_base::merger_base ( const Array<shared_ptr<pdf> > &S ):
-        Npoints(0), DBG(false), dbg_file(0) {
+merger_base::merger_base ( const Array<shared_ptr<pdf> > &S ) :
+                Npoints ( 0 ), DBG ( false ), dbg_file ( 0 ) {
         set_sources ( S );
 }
@@ -103 +103 @@
                 //Re-Initialize Mixture model
                 Mix.flatten ( &Mix_init );
-                Mix.bayes_batch ( Smp_ex,empty_vec, w*Npoints );
+                Mix.bayes_batch ( Smp_ex, empty_vec, w*Npoints );
                 delete Mpred;
                 Mpred = Mix.epredictor ( ); // Allocation => must be deleted at the end!!
@@ -151 +151 @@
                         if ( pdfs ( i )->dimension() == dim ) {
                                 // no need for conditioning or marginalization
-                                lw_src = pdfs ( i )->evallogcond_mat ( Smp , vec(0));
+                                lw_src = pdfs ( i )->evallogcond_mat ( Smp , vec ( 0 ) );
                         } else {
                                 // compute likelihood of marginal on the conditional variable
@@ -187 +187 @@
                                 // Compute likelihood of the partial source
                                 for ( int k = 0; k < Npoints; k++ ) {
-                                        lw_src ( k ) += pdfs ( i )->evallogcond ( dls ( i )->pushdown ( Smp ( k ) ),  
-                                                         dls ( i )->get_cond ( Smp ( k ) ));
+                                        lw_src ( k ) += pdfs ( i )->evallogcond ( dls ( i )->pushdown ( Smp ( k ) ),
+                                                        dls ( i )->get_cond ( Smp ( k ) ) );
                                 }