Changeset 286 for bdm/estim/mixef.h

Timestamp:

03/05/09 14:03:35 (15 years ago)

Author:

smidl

Message:

make mpdm work again

Files:

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

bdm/estim/mixef.h

@@ -19 +19 @@
 #include "../stat/emix.h"
 
-namespace bdm{
+namespace bdm {
 
 enum MixEF_METHOD { EM = 0, QB = 1};
@@ -50 +50 @@
         eprod* est;
         ////!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() {
-                Array<const epdf*> epdfs ( n+1 );
-                for ( int i=0;i<Coms.length();i++ ) {
+                est = new eprod;
+                if ( n>0 ) {
+                        Array<const epdf*> epdfs ( n+1 );
+                        for ( int i=0;i<Coms.length();i++ ) {
 //                      it_assert_debug(!x,"MixEF::MixEF : Incompatible components");
-                        epdfs ( i ) =& ( Coms ( i )->posterior() );
+                                epdfs ( i ) =& ( Coms ( i )->posterior() );
+                        }
+                        // last in the product is the weight
+                        epdfs ( n ) =& ( weights.posterior() );
+                        est->set_parameters ( epdfs, false );
                 }
-                // last in the product is the weight
-                epdfs ( n ) =& ( weights.posterior() );
-                est = new eprod ( epdfs );
         }
 
@@ -69 +72 @@
         //! Full constructor
         MixEF ( const Array<BMEF*> &Coms0, const vec &alpha0 ) :
-                        BMEF (  ), n ( Coms0.length() ), Coms ( n ),
-                        weights (), method(QB) {
-        //      it_assert_debug ( n>0,"MixEF::MixEF : Empty Component list" );
+                        BMEF ( ), n ( Coms0.length() ), Coms ( n ),
+                        weights (), method ( QB ) {
+                //      it_assert_debug ( n>0,"MixEF::MixEF : Empty Component list" );
 
                 for ( int i=0;i<n;i++ ) {Coms ( i ) = ( BMEF* ) Coms0 ( i )->_copy_();}
@@ -79 +82 @@
         MixEF () :
                         BMEF ( ), n ( 0 ), Coms ( 0 ),
-                        weights (),method(QB) {build_est();}
+                        weights (),method ( QB ) {build_est();}
         //! Copy constructor
-        MixEF(const MixEF &M2): BMEF ( ), n ( M2.n ), Coms ( n ),
-                   weights ( M2.weights ), method(M2.method) {
-        //      it_assert_debug ( n>0,"MixEF::MixEF : Empty Component list" );
+        MixEF ( const MixEF &M2 ) : BMEF ( ), n ( M2.n ), Coms ( n ),
+                        weights ( M2.weights ), method ( M2.method ) {
+                //      it_assert_debug ( n>0,"MixEF::MixEF : Empty Component list" );
 
-                           for ( int i=0;i<n;i++ ) {Coms ( i ) = M2.Coms ( i )->_copy_();}
-                           build_est();
-                   }
+                for ( int i=0;i<n;i++ ) {Coms ( i ) = M2.Coms ( i )->_copy_();}
+                build_est();
+        }
         //! Initializing the mixture by a random pick of centroids from data
         //! \param Com0 Initial component - necessary to determine its type.
@@ -108 +111 @@
         emix* epredictor() const;
         //! Flatten the density as if it was not estimated from the data
-        void flatten(const BMEF* M2);
+        void flatten ( const BMEF* M2 );
         //! Access function
-        BMEF* _Coms(int i){return Coms(i);}
-        
+        BMEF* _Coms ( int i ) {return Coms ( i );}
+
         //!Set which method is to be used
-        void set_method(MixEF_METHOD M){method=M;}
+        void set_method ( MixEF_METHOD M ) {method=M;}
 };