Changeset 886 for library/bdm/estim

Timestamp:

03/29/10 23:01:49 (14 years ago)

Author:

smidl

Message:

epdf and emix now have _base classes

Location:

library/bdm/estim

Files:

• mixtures.cpp (modified) (1 diff)
• mixtures.h (modified) (6 diffs)

library/bdm/estim/mixtures.cpp

@@ -35 +35 @@
         }
 
-        //est already exists - must be deleted before build_est() can be used
-        delete est;
-        build_est();
 }
 

library/bdm/estim/mixtures.h

@@ -48 +48 @@
         //! Statistics for weights
         multiBM weights;
+        //aux
+        friend class eprod_mix;
         //!Posterior on component parameters
-        eprod* est;
+        class eprod_mix: public eprod_base {
+                protected:
+                const MixEF &mix; // pointer to parent.n
+                public:
+                eprod_mix(const MixEF &m):mix(m){}
+                const epdf* factor(int i) const {return (i==(mix.n-1)) ? &mix.weights.posterior() : &mix.Coms(i)->posterior();}
+                const int no_factors()const {return mix.n+1;}
+        } est;
         ////!Indeces of component rvc in common rvc
 
@@ -55 +64 @@
         MixEF_METHOD method;
 
-        //! Auxiliary function for use in constructors
-        void build_est() {
-                est = new eprod;
-                if ( n > 0 ) {
-                        Array<const epdf*> epdfs ( n + 1 );
-                        for ( int i = 0; i < Coms.length(); i++ ) {
-                                epdfs ( i ) = & ( Coms ( i )->posterior() );
-                        }
-                        // last in the product is the weight
-                        epdfs ( n ) = & ( weights.posterior() );
-                        est->set_parameters ( epdfs, false );
-                }
-        }
-
 public:
         //! Full constructor
         MixEF ( const Array<BMEF*> &Coms0, const vec &alpha0 ) :
                         BMEF ( ), n ( Coms0.length() ), Coms ( n ),
-                        weights (), method ( QB ) {
+                        weights (), est(*this), method ( QB ) {
                 for ( int i = 0; i < n; i++ ) {
                         Coms ( i ) = ( BMEF* ) Coms0 ( i )->_copy();
@@ -79 +74 @@
                 weights.set_parameters(alpha0);
                 weights.validate();
-                build_est();
         }
 
@@ -85 +79 @@
         MixEF () :
                         BMEF ( ), n ( 0 ), Coms ( 0 ),
-                        weights (), method ( QB ) {
-                build_est();
+                        weights (), est(*this), method ( QB ) {
         }
         //! Copy constructor
         MixEF ( const MixEF &M2 ) : BMEF ( ), n ( M2.n ), Coms ( n ),
-                        weights ( M2.weights ), method ( M2.method ) {
+                        weights ( M2.weights ), est(*this), method ( M2.method ) {
                 for ( int i = 0; i < n; i++ ) {
                         Coms ( i ) = (BMEF*) M2.Coms ( i )->_copy();
                 }
-                build_est();
         }
 
@@ -103 +95 @@
         void init ( BMEF* Com0, const mat &Data, const int c = 5 );
         //Destructor
-        ~MixEF() {
-                delete est;
-                for ( int i = 0; i < n; i++ ) {
-                        delete Coms ( i );
-                }
-        }
         //! Recursive EM-like algorithm (QB-variant), see Karny et. al, 2006
         void bayes ( const vec &yt, const vec &cond );
@@ -117 +103 @@
         double logpred ( const vec &yt ) const;
         //! return correctly typed posterior (covariant return)
-        const eprod& posterior() const {
-                return *est;
+        const eprod_mix& posterior() const {
+                return est;
         }