Changeset 175 for bdm/stat/emix.h

Timestamp:

10/09/08 11:32:11 (16 years ago)

Author:

smidl

Message:

mprod is now based on compositepdf

Files:

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

bdm/stat/emix.h

@@ -68 +68 @@
 Note that
 */
-class mprod: public mpdf {
-protected:
-        //
-        int n;
+class mprod: public compositepdf, public mpdf {
+protected:
         // pointers to epdfs
         Array<epdf*> epdfs;
-        Array<mpdf*> mpdfs;
-        //
-        //! Indeces of rvs in common rv
-        Array<ivec> rvinds;
-        //! Indeces of rvc in common rv
-        Array<ivec> rvcinrv;
         //! Indeces of rvc in common rvc
         Array<ivec> rvcinds;
-//      //! Indicate independence of its factors
-//      bool independent;
-//      //! Indicate internal creation of mpdfs which must be destroyed
-//      bool intermpdfs;
 public:
         /*!\brief Constructor from list of mFacs,
         Additional parameter overlap is left for future use. Do not set to true for mprod.
         */
-        mprod ( Array<mpdf*> mFacs, bool overlap=false );
+        mprod ( Array<mpdf*> mFacs): compositepdf(mFacs), mpdf(getrv(true),RV()), rvcinds(n), epdfs(n)
+        {       setrvc(rv,rvc);
+                setrvcinrv(rvc,rvcinds);
+                setindices(rv); 
+        for(int i=0;i<n;i++){epdfs(i)=&(mpdfs(i)->_epdf());}
+        };
 
         double evalpdflog ( const vec &val ) const {
@@ -99 +92 @@
                                 {mpdfs ( i )->condition ( val ( rvcinds ( i ) ) );}
                         // add logarithms
-                        res += epdfs ( i )->evalpdflog ( val ( rvinds ( i ) ) );
+                        res += epdfs ( i )->evalpdflog ( val ( rvsinrv ( i ) ) );
                 }
                 return res;
@@ -110 +103 @@
                 for ( int i = ( n - 1 );i >= 0;i-- ) {
                         if ( rvcinds ( i ).length() > 0 ) {
-                                condi = zeros ( rvcinrv.length() + rvcinds.length() );
+                                condi = zeros ( rvcsinrv.length() + rvcinds.length() );
                                 // copy data in condition
                                 set_subvector ( condi,rvcinds ( i ), cond );
                                 // copy data in already generated sample
-                                set_subvector ( condi,rvcinrv ( i ), smp );
+                                set_subvector ( condi,rvcsinrv ( i ), smp );
 
                                 mpdfs ( i )->condition ( condi );
@@ -120 +113 @@
                         smpi = epdfs ( i )->sample();
                         // copy contribution of this pdf into smp
-                        set_subvector ( smp,rvinds ( i ), smpi );
+                        set_subvector ( smp,rvsinrv ( i ), smpi );
                         // add ith likelihood contribution
                         ll+=epdfs ( i )->evalpdflog ( smpi );