Changeset 713 for library/bdm/stat/emix.h

Timestamp:

11/10/09 11:03:09 (15 years ago)

Author:

mido

Message:

_m changed to _mat

emix.cfg prepared, but it is not yet debugged!

Files:

• library/bdm/stat/emix.h (modified) (5 diffs)

library/bdm/stat/emix.h

@@ -159 +159 @@
                 return tmp;
         };
-        vec evallog_m ( const mat &Val ) const {
+        vec evallog_mat ( const mat &Val ) const {
                 vec x = zeros ( Val.cols() );
                 for ( int i = 0; i < w.length(); i++ ) {
-                        x += w ( i ) * exp ( Coms ( i )->evallog_m ( Val ) );
+                        x += w ( i ) * exp ( Coms ( i )->evallog_mat ( Val ) );
                 }
                 return log ( x );
         };
+        /*
         //! Auxiliary function that returns pdflog for each component
-        mat evallog_M ( const mat &Val ) const {
+        mat evallog_mat ( const mat &Val ) const {
                 mat X ( w.length(), Val.cols() );
                 for ( int i = 0; i < w.length(); i++ ) {
-                        X.set_row ( i, w ( i ) *exp ( Coms ( i )->evallog_m ( Val ) ) );
+                        X.set_row ( i, w ( i ) *exp ( Coms ( i )->evallog_mat ( Val ) ) );
                 }
                 return X;
         };
+        */
 
         shared_ptr<epdf> marginal ( const RV &rv ) const;
@@ -180 +182 @@
         shared_ptr<pdf> condition ( const RV &rv ) const;
 
-//Access methods
+        //Access methods
         //! returns a pointer to the internal mean value. Use with Care!
         vec& _w() {
@@ -197 +199 @@
                 }
         }
+
+        //! Load from structure with elements:
+        //!  \code
+        //! { class='emix';
+        //!   pdfs = (..., ...);     // list of pdfs in the mixture
+        //!   weights = ( 0.5, 0.5 ); // weights of pdfs in the mixture
+        //! }
+        //! \endcode
+        //!@}
+        void from_setting ( const Setting &set ) {
+                UI::get ( Coms, set, "pdfs", UI::compulsory );
+
+                if( !UI::get( w, set, "weights", UI::optional ) )
+                {
+                        int len = Coms.length();
+                        w.set_length( len );
+                        double default_weight = 1.0 / len;
+                        for( int i=0; i < len; i++)
+                                w(i) = default_weight;
+                }
+        }
 };
 SHAREDPTR( emix );
+UIREGISTER ( emix );
 
 /*!
@@ -322 +346 @@
                 return res;
         }
-        vec evallogcond_m ( const mat &Dt, const vec &cond ) {
+        vec evallogcond_mat ( const mat &Dt, const vec &cond ) {
                 vec tmp ( Dt.cols() );
                 for ( int i = 0; i < Dt.cols(); i++ ) {
@@ -329 +353 @@
                 return tmp;
         };
-        vec evallogcond_m ( const Array<vec> &Dt, const vec &cond ) {
+        vec evallogcond_mat ( const Array<vec> &Dt, const vec &cond ) {
                 vec tmp ( Dt.length() );
                 for ( int i = 0; i < Dt.length(); i++ ) {