Changeset 189 for bdm/estim/mixef.h

Timestamp:

10/22/08 10:46:36 (16 years ago)

Author:

smidl

Message:

extend MixEF to allow for EM algorithm and alow estimation of weighted empirical density

Files:

• bdm/estim/mixef.h (modified) (6 diffs)

bdm/estim/mixef.h

@@ -20 +20 @@
 
 using namespace itpp;
+
+enum MixEF_METHOD { EM = 0, QB = 1};
 
 /*!
@@ -49 +51 @@
         ////!Indeces of component rvc in common rvc
         
+        //! Flag for a method that is used in the inference
+        MixEF_METHOD method;
+        
         //! Auxiliary function for use in constructors
         void build_est() {
@@ -65 +70 @@
         MixEF ( const Array<BMEF*> &Coms0, const vec &alpha0 ) :
                         BM ( RV() ), n ( Coms0.length() ), Coms ( n ),
-                        weights ( RV ( "{w }", vec_1 ( n ) ),alpha0 ) {
+                        weights ( RV ( "{w }", vec_1 ( n ) ),alpha0 ), method(QB) {
         //      it_assert_debug ( n>0,"MixEF::MixEF : Empty Component list" );
 
@@ -73 +78 @@
         MixEF () :
                         BM ( RV() ), n ( 0 ), Coms ( 0 ),
-                        weights ( RV ( "{w }", vec_1 ( 0 ) ),vec ( 0 ) ) {build_est();}
+                        weights ( RV ( "{w }", vec_1 ( 0 ) ),vec ( 0 ) ),method(QB) {build_est();}
         //! Initializing the mixture by a random pick of centroids from data
         //! \param Com0 Initial component - necessary to determine its type.
@@ -88 +93 @@
         //! EM algorithm
         void bayes ( const mat &dt );
-        void bayesB ( const mat &dt );
+        void bayesB ( const mat &dt, const vec &wData );
         double logpred ( const vec &dt ) const;
         const epdf& _epdf() const {return *est;}
@@ -94 +99 @@
         //! Flatten the density as if it was not estimated from the data
         void flatten(double sumw=1.0);
+        
+        //!Set which method is to be used
+        void set_method(MixEF_METHOD M){method=M;}
 };