Changeset 1004

Timestamp:

05/27/10 13:08:44 (14 years ago)

Author:

smidl

Message:

mixtures do not have n

Location:

library/bdm/estim

Files:

• mixtures.cpp (modified) (6 diffs)
• mixtures.h (modified) (5 diffs)

library/bdm/estim/mixtures.cpp

@@ -8 +8 @@
         //prepare sizes
         Coms.set_size ( c );
-        n = c;
         weights.set_parameters ( ones ( c ) ); //assume at least one observation in each comp.
         //est will be done at the end
@@ -22 +21 @@
 
         //Copy it to the rest
-        for ( i = 1; i < n; i++ ) {
+        for ( i = 1; i < Coms.length(); i++ ) {
                 //copy Com0 and create new rvs for them
                 Coms ( i ) =  (BMEF*) Coms ( 0 )->_copy ( );
         }
         //Pick some data for each component and update it
-        for ( i = 0; i < n; i++ ) {
+        for ( i = 0; i < Coms.length(); i++ ) {
                 //pick one datum
                 int ind = (int) floor ( ndat * UniRNG.sample() );
@@ -44 +43 @@
         multiBM weights0 ( weights );
 
+        int n = Coms.length();
         Array<BMEF*> Coms0 ( n );
         for ( i = 0; i < n; i++ ) {
@@ -131 +131 @@
         vec w = weights.posterior().mean();
         double exLL = 0.0;
-        for ( int i = 0; i < n; i++ ) {
+        for ( int i = 0; i < Coms.length(); i++ ) {
                 exLL += w ( i ) * exp ( Coms ( i )->logpred ( yt ) );
         }
@@ -138 +138 @@
 
 emix* MixEF::epredictor ( const vec &vec) const {
-        Array<shared_ptr<epdf> > pC ( n );
-        for ( int i = 0; i < n; i++ ) {
+        Array<shared_ptr<epdf> > pC ( Coms.length() );
+        for ( int i = 0; i < Coms.length(); i++ ) {
                 pC ( i ) = Coms ( i )->epredictor ( );
                 pC (i) -> set_rv(_yrv());
@@ -153 +153 @@
 void MixEF::flatten ( const BMEF* M2 ) {
         const MixEF* Mix2 = dynamic_cast<const MixEF*> ( M2 );
-        bdm_assert_debug ( Mix2->n == n, "Different no of coms" );
+        bdm_assert_debug ( Mix2->Coms.length() == Coms.length(), "Different no of coms" );
         //Flatten each component
-        for ( int i = 0; i < n; i++ ) {
+        for ( int i = 0; i < Coms.length(); i++ ) {
                 Coms ( i )->flatten ( Mix2->Coms ( i ) );
         }

library/bdm/estim/mixtures.h

@@ -43 +43 @@
 class MixEF: public BMEF {
 protected:
-        //!Number of components
-        int n;
         //! Models for Components of \f$\theta_i\f$
         Array<BMEF*> Coms;
@@ -57 +55 @@
                 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;}
+                const epdf* factor(int i) const {return (i==(mix.Coms.length()-1)) ? &mix.weights.posterior() : &mix.Coms(i)->posterior();}
+                const int no_factors()const {return mix.Coms.length()+1;}
         } est;
         ////!indices of component rvc in common rvc
@@ -68 +66 @@
         //! Full constructor
         MixEF ( const Array<BMEF*> &Coms0, const vec &alpha0 ) :
-                        BMEF ( ), n ( Coms0.length() ), Coms ( n ),
+                        BMEF ( ), Coms ( Coms0.length() ),
                         weights (), est(*this), method ( QB ) {
-                for ( int i = 0; i < n; i++ ) {
+                for ( int i = 0; i < Coms0.length(); i++ ) {
                         Coms ( i ) = ( BMEF* ) Coms0 ( i )->_copy();
                 }
@@ -79 +77 @@
         //! Constructor of empty mixture
         MixEF () :
-                        BMEF ( ), n ( 0 ), Coms ( 0 ),
+                        BMEF ( ), Coms ( 0 ),
                         weights (), est(*this), method ( QB ) {
         }
         //! Copy constructor
-        MixEF ( const MixEF &M2 ) : BMEF ( ), n ( M2.n ), Coms ( n ),
+        MixEF ( const MixEF &M2 ) : BMEF ( ),  Coms ( M2.Coms.length() ),
                         weights ( M2.weights ), est(*this), method ( M2.method ) {
-                for ( int i = 0; i < n; i++ ) {
+                for ( int i = 0; i < M2.Coms.length(); i++ ) {
                         Coms ( i ) = (BMEF*) M2.Coms ( i )->_copy();
                 }
@@ -121 +119 @@
         }
 
-        void to_setting ( Setting &set ) const {
-                BMEF::to_setting( set );
-                UI::save ( Coms, set, "Coms" );
-                UI::save ( &weights, set, "weights" );
-        }
+void to_setting ( Setting &set ) const {
+        BMEF::to_setting( set );
+        UI::save ( Coms, set, "Coms" );
+        UI::save ( &weights, set, "weights" );
+}
+/*! \brief reads data from setting
+*/
+void from_setting (const  Setting &set ) {
+        BMEF::from_setting( set );
+        UI::get ( Coms, set, "Coms" );
+        UI::get ( weights, set, "weights" );
+}
 };
 UIREGISTER ( MixEF );