Changeset 175

Timestamp:

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

Author:

smidl

Message:

mprod is now based on compositepdf

Location:

bdm/stat

Files:

• emix.cpp (modified) (1 diff)
• emix.h (modified) (4 diffs)
• libBM.cpp (modified) (1 diff)
• libBM.h (modified) (1 diff)

bdm/stat/emix.cpp

@@ -23 +23 @@
 }
 
-mprod::mprod ( Array<mpdf*> mFacs, bool overlap) : mpdf ( RV(), RV() ), n ( mFacs.length() ), epdfs ( n ), mpdfs ( mFacs ), rvinds ( n ), rvcinrv ( n ), rvcinds ( n ) {
-                int i;
-                bool rvaddok;
-                // Create rv
-                for ( i = 0;i < n;i++ ) {
-                        rvaddok=rv.add ( mpdfs ( i )->_rv() ); //add rv to common rvs.
-                        // If rvaddok==false, mpdfs overlap => assert error.
-                        it_assert_debug(rvaddok||overlap,"mprod::mprod() input mpdfs overlap in rv!");
-                        epdfs ( i ) = & ( mpdfs ( i )->_epdf() ); // add pointer to epdf
-                };
-                // Create rvc
-                for ( i = 0;i < n;i++ ) {
-                        rvc.add ( mpdfs ( i )->_rvc().subt ( rv ) ); //add rv to common rvs.
-                };
-                
-//              independent = true;
-                //test rvc of mpdfs and fill rvinds
-                for ( i = 0;i < n;i++ ) {
-                        // find ith rv in common rv
-                        rvinds ( i ) = mpdfs ( i )->_rv().dataind ( rv );
-                        // find ith rvc in common rv
-                        rvcinrv ( i ) = mpdfs ( i )->_rvc().dataind ( rv );
-                        // find ith rvc in common rv
-                        rvcinds ( i ) = mpdfs ( i )->_rvc().dataind ( rvc );
-                        //
-/*                      if ( rvcinrv ( i ).length() >0 ) {independent = false;}
-                        if ( rvcinds ( i ).length() >0 ) {independent = false;}*/
-                }
-        };
+// mprod::mprod ( Array<mpdf*> mFacs, bool overlap) : mpdf ( RV(), RV() ), n ( mFacs.length() ), epdfs ( n ), mpdfs ( mFacs ), rvinds ( n ), rvcinrv ( n ), rvcinds ( n ) {
+//              int i;
+//              bool rvaddok;
+//              // Create rv
+//              for ( i = 0;i < n;i++ ) {
+//                      rvaddok=rv.add ( mpdfs ( i )->_rv() ); //add rv to common rvs.
+//                      // If rvaddok==false, mpdfs overlap => assert error.
+//                      it_assert_debug(rvaddok||overlap,"mprod::mprod() input mpdfs overlap in rv!");
+//                      epdfs ( i ) = & ( mpdfs ( i )->_epdf() ); // add pointer to epdf
+//              };
+//              // Create rvc
+//              for ( i = 0;i < n;i++ ) {
+//                      rvc.add ( mpdfs ( i )->_rvc().subt ( rv ) ); //add rv to common rvs.
+//              };
+//              
+// //           independent = true;
+//              //test rvc of mpdfs and fill rvinds
+//              for ( i = 0;i < n;i++ ) {
+//                      // find ith rv in common rv
+//                      rvsinrv ( i ) = mpdfs ( i )->_rv().dataind ( rv );
+//                      // find ith rvc in common rv
+//                      rvcinrv ( i ) = mpdfs ( i )->_rvc().dataind ( rv );
+//                      // find ith rvc in common rv
+//                      rvcinds ( i ) = mpdfs ( i )->_rvc().dataind ( rvc );
+//                      //
+// /*                   if ( rvcinrv ( i ).length() >0 ) {independent = false;}
+//                      if ( rvcinds ( i ).length() >0 ) {independent = false;}*/
+//              }
+//      };

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 );

bdm/stat/libBM.cpp

@@ -183 +183 @@
 void RV::newids(){ids=linspace ( RVcounter+1, RVcounter+len ),RVcounter+=len;}
 
+RV compositepdf::getrv(bool checkoverlap){
+        RV rv; //empty rv
+        bool rvaddok;
+        for (int i = 0;i < n;i++ ) {
+                rvaddok=rv.add ( mpdfs ( i )->_rv() ); //add rv to common rvs.
+                        // If rvaddok==false, mpdfs overlap => assert error.
+                it_assert_debug(rvaddok||(!checkoverlap),"mprod::mprod() input mpdfs overlap in rv!");
+        };
+        return rv;
+}
+
+void compositepdf::setrvc(const RV &rv, RV &rvc){
+        for (int i = 0;i < n;i++ ) {
+                rvc.add ( mpdfs ( i )->_rvc().subt ( rv ) ); //add rv to common rvc
+        };
+}
+
+void compositepdf::setindices(const RV &rv){
+        for (int i = 0;i < n;i++ ) {
+                        // find ith rv in common rv
+                rvsinrv ( i ) = mpdfs ( i )->_rv().dataind ( rv );
+                rvcsinrv ( i ) = mpdfs ( i )->_rvc().dataind ( rv );
+        }
+}
+
+void compositepdf::setrvcinrv(const RV &rvc, Array<ivec> &rvinds){
+        for (int i = 0;i < n;i++ ) {
+                        // find ith rv in common rv
+                rvinds ( i ) = mpdfs ( i )->_rvc().dataind ( rvc );
+        }
+}
+
+
 void BM::bayesB(const mat &Data){
         for(int t=0;t<Data.cols();t++){bayes(Data.get_col(t));}

bdm/stat/libBM.h

@@ -233 +233 @@
 };
 
+//!\brief Abstract composition of pdfs, a base for specific classes 
+class compositepdf{
+        protected:
+                //!Number of mpdfs in the composite
+                int n;
+                //! Elements of composition
+                Array<mpdf*> mpdfs;
+                //! Indeces of rvs in common rv
+                Array<ivec> rvsinrv;
+                //! Indeces of rvc in common rv
+                Array<ivec> rvcsinrv;
+        public:
+                compositepdf(Array<mpdf*> A0): n(A0.length()), mpdfs(A0), rvsinrv(n), rvcsinrv(n){};
+                RV getrv(bool checkoverlap=false);
+                void setrvc(const RV &rv, RV &rvc);
+                void setindices(const RV &rv);
+                void setrvcinrv(const RV &rvc, Array<ivec> &rvcind);
+};
+
 /*! \brief Abstract class for discrete-time sources of data.