Changeset 1004 for library/bdm/estim/mixtures.cpp

Timestamp:

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

Author:

smidl

Message:

mixtures do not have n

Files:

• library/bdm/estim/mixtures.cpp (modified) (6 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 ) );
         }