Changeset 477 for library/bdm/estim/particles.cpp

Timestamp:

08/05/09 14:40:03 (15 years ago)

Author:

mido

Message:

panove, vite, jak jsem peclivej na upravu kodu.. snad se vam bude libit:) konfigurace je v souboru /system/astylerc

Files:

• library/bdm/estim/particles.cpp (modified) (2 diffs)

library/bdm/estim/particles.cpp

@@ -9 +9 @@
         vec lls ( n );
         ivec ind;
-        double mlls=-std::numeric_limits<double>::infinity(), sum=0.0;
+        double mlls = -std::numeric_limits<double>::infinity(), sum = 0.0;
 
-        for ( i=0;i<n;i++ ) {
+        for ( i = 0; i < n; i++ ) {
                 //generate new samples from paramater evolution model;
                 _samples ( i ) = par->samplecond ( _samples ( i ) );
                 lls ( i ) = par->e()->evallog ( _samples ( i ) );
-                lls ( i ) *= obs->evallogcond ( dt,_samples ( i ) );
+                lls ( i ) *= obs->evallogcond ( dt, _samples ( i ) );
 
-                if ( lls ( i ) >mlls ) mlls=lls ( i ); //find maximum
+                if ( lls ( i ) > mlls ) mlls = lls ( i ); //find maximum
         }
 
         // compute weights
-        for ( i=0;i<n;i++ ) {
+        for ( i = 0; i < n; i++ ) {
                 _w ( i ) *= exp ( lls ( i ) - mlls ); // multiply w by likelihood
         }
 
         //renormalize
-        for ( i=0;i<n;i++ ) {sum+=_w ( i );};
+        for ( i = 0; i < n; i++ ) {
+                sum += _w ( i );
+        };
 
-        _w ( i ) /=sum; //?
+        _w ( i ) /= sum; //?
 
-        ind = est.resample(resmethod);
+        ind = est.resample ( resmethod );
 
 }
@@ -36 +38 @@
 // void PF::set_est ( const epdf &epdf0 ) {
 //      int i;
-// 
+//
 //      for ( i=0;i<n;i++ ) {
 //              _samples ( i ) = epdf0.sample();