Changeset 204 for bdm/stat/emix.h

Timestamp:

11/10/08 15:40:29 (16 years ago)

Author:

smidl

Message:

merger is now in logarithms + new merge_test

Files:

• bdm/stat/emix.h (modified) (9 diffs)

bdm/stat/emix.h

@@ -47 +47 @@
         //!Default constructor. By default, the given epdf is not copied!
         //! It is assumed that this function will be used only temporarily.
-        mratio ( const epdf* nom0, const RV &rv, bool copy=false ) :mpdf ( rv,nom0->_rv().subt(rv) ), dl(rv,rvc,nom0->_rv()) {
+        mratio ( const epdf* nom0, const RV &rv, bool copy=false ) :mpdf ( rv,nom0->_rv().subt ( rv ) ), dl ( rv,rvc,nom0->_rv() ) {
                 if ( copy ) {
 //                      nom = nom0->_copy_();
-                        it_error("todo");
+                        it_error ( "todo" );
                         destroynom=true;
                 }
@@ -61 +61 @@
         };
         double evalcond ( const vec &val, const vec &cond ) {
-                vec nom_val(rv.count()+rvc.count());
-                dl.fill_val_cond(nom_val,val,cond);
+                vec nom_val ( rv.count() +rvc.count() );
+                dl.fill_val_cond ( nom_val,val,cond );
                 return exp ( nom->evalpdflog ( nom_val ) - den->evalpdflog ( cond ) );
         }
@@ -132 +132 @@
         //! Auxiliary function for taking ownership of the Coms()
         void ownComs() {destroyComs=true;}
-        
+
         //!access function
-        epdf* _Coms(int i){return Coms(i);}
+        epdf* _Coms ( int i ) {return Coms ( i );}
 };
 
@@ -175 +175 @@
                                                 // add logarithms
                                                 res += epdfs ( i )->evalpdflog ( dls ( i )->get_val ( val ) );*/
-                        res *= mpdfs ( i )->evalcond ( 
-                                                   dls ( i )->get_val ( val ),
-                        dls ( i )->get_cond ( val, cond )
-                                                                                 );
+                        res *= mpdfs ( i )->evalcond (
+                                   dls ( i )->get_val ( val ),
+                                   dls ( i )->get_cond ( val, cond )
+                               );
                 }
                 return res;
@@ -222 +222 @@
                         independent=rv.add ( epdfs ( i )->_rv() );
                         it_assert_debug ( independent==true, "eprod:: given components are not independent ." );
-                        dls ( i ) = new datalink_e2e( epdfs ( i )->_rv() , rv );
+                }
+                for ( int i=0;i<epdfs.length();i++ ) {
+                        dls ( i ) = new datalink_e2e ( epdfs ( i )->_rv() , rv );
                 }
         }
@@ -230 +232 @@
                 for ( int i=0;i<epdfs.length();i++ ) {
                         vec pom = epdfs ( i )->mean();
-                        dls(i)->fill_val(tmp, pom );
+                        dls ( i )->fill_val ( tmp, pom );
                 }
                 return tmp;
@@ -238 +240 @@
                 for ( int i=0;i<epdfs.length();i++ ) {
                         vec pom = epdfs ( i )->sample();
-                        dls(i)->fill_val(tmp, pom );
+                        dls ( i )->fill_val ( tmp, pom );
                 }
                 return tmp;
@@ -245 +247 @@
                 double tmp=0;
                 for ( int i=0;i<epdfs.length();i++ ) {
-                        tmp+=epdfs ( i )->evalpdflog ( dls(i)->get_val ( val ) );
+                        tmp+=epdfs ( i )->evalpdflog ( dls ( i )->get_val ( val ) );
                 }
                 return tmp;
@@ -251 +253 @@
         //!access function
         const epdf* operator () ( int i ) const {it_assert_debug ( i<epdfs.length(),"wrong index" );return epdfs ( i );}
-        
+
         //!Destructor
-        ~eprod(){for(int i=0;i<epdfs.length();i++){delete dls(i);}}
+        ~eprod() {for ( int i=0;i<epdfs.length();i++ ) {delete dls ( i );}}
 };