Changeset 168 for bdm/stat/emix.h

Timestamp:

09/18/08 19:54:09 (16 years ago)

Author:

smidl

Message:

Work on mixtures of EF, small changes

Files:

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

bdm/stat/emix.h

@@ -82 +82 @@
         //! Indeces of rvc in common rvc
         Array<ivec> rvcinds;
-        //! Indicate independence of its factors
-        bool independent;
+//      //! 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, 
+        /*!\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, bool overlap=false );
 
         double evalpdflog ( const vec &val ) const {
@@ -122 +122 @@
                         set_subvector ( smp,rvinds ( i ), smpi );
                         // add ith likelihood contribution
-                        ll+=epdfs(i)->evalpdflog(smpi);
+                        ll+=epdfs ( i )->evalpdflog ( smpi );
                 }
                 return smp;
         }
         mat samplecond ( const vec &cond, vec &ll, int N ) {
-                mat Smp(rv.count(),N);
-                for(int i=0;i<N;i++){Smp.set_col(i,samplecond(cond,ll(i)));}
+                mat Smp ( rv.count(),N );
+                for ( int i=0;i<N;i++ ) {Smp.set_col ( i,samplecond ( cond,ll ( i ) ) );}
                 return Smp;
         }
-//      vec mean() const {
-//              vec tmp ( rv.count() );
-//              if ( independent ) {
-//                      for ( int i=0;i<n;i++ ) {
-//                              vec pom = epdfs ( i )->mean();
-//                              set_subvector ( tmp,rvinds ( i ), pom );
-//                      }
-//              }
-//              else {
-//                      int N=50*rv.count();
-//                      it_warning ( "eprod.mean() computed by sampling" );
-//                      tmp = zeros ( rv.count() );
-//                      for ( int i=0;i<N;i++ ) { tmp += sample();}
-//                      tmp /=N;
-//              }
-//              return tmp;
-//      }
 
         ~mprod() {};
 };
+
+//! Product of independent epdfs. For dependent pdfs, use mprod.
+class eprod: public epdf {
+protected:
+        //! Components (epdfs)
+        Array<epdf*> epdfs;
+        //! Array of indeces
+        Array<ivec> rvinds;
+public:
+        eprod ( const Array<epdf*> epdfs0 ) : epdf ( RV() ),epdfs ( epdfs0 ),rvinds ( epdfs.length() ) {
+                bool independent=true;
+                for ( int i=0;i<epdfs.length();i++ ) {
+                        independent=rv.add ( epdfs ( i )->_rv() );
+                        it_assert_debug ( independent==true, "eprod:: given components are not independent ." );
+                        rvinds ( i ) = ( epdfs ( i )->_rv() ).dataind ( rv );
+                }
+        }
+
+        vec mean() const {
+                vec tmp ( rv.count() );
+                for ( int i=0;i<epdfs.length();i++ ) {
+                        vec pom = epdfs ( i )->mean();
+                        set_subvector ( tmp,rvinds ( i ), pom );
+                }
+                return tmp;
+        }
+        vec sample() const {
+                vec tmp ( rv.count() );
+                for ( int i=0;i<epdfs.length();i++ ) {
+                        vec pom = epdfs ( i )->sample();
+                        set_subvector ( tmp,rvinds ( i ), pom );
+                }
+                return tmp;
+        }
+        double evalpdflog ( const vec &val ) const {
+                double tmp=0;
+                for ( int i=0;i<epdfs.length();i++ ) {
+                        tmp+=epdfs(i)->evalpdflog(val(rvinds(i)));
+                }
+                return tmp;
+        }
+};
+
 
 /*! \brief Mixture of mpdfs with constant weights, all mpdfs are of equal type