Changeset 536 for library/bdm/estim

Timestamp:

08/16/09 18:13:31 (15 years ago)

Author:

smidl

Message:

removal of unused functions _e() and samplecond(,) and added documentation lines

Location:

library/bdm/estim

Files:

• arx.h (modified) (1 diff)
• kalman.h (modified) (6 diffs)
• mixtures.h (modified) (2 diffs)
• particles.h (modified) (3 diffs)

library/bdm/estim/arx.h

@@ -110 +110 @@
         //!\name Access attributes
         //!@{
-        const egiw* _e() const {
-                return &est ;
-        };
         const egiw& posterior() const {
                 return est;

library/bdm/estim/kalman.h

@@ -125 +125 @@
                 return est;
         }
-        const enorm<sq_T>* _e() const {
-                return &est;
-        }
         //!access function
         mat& __K() {
@@ -214 +211 @@
                 return E;
         };
-        const enorm<fsqmat>* _e() const {
-                return &E;
-        };
         const mat _R() {
                 return P;
@@ -277 +271 @@
         // TODO dodelat void to_setting( Setting &set ) const;
 
+        const enorm<chmat>& posterior() {return est;}
 };
 
@@ -423 +418 @@
 
                 est.set_rv ( RV ( "MM", A ( 0 )->posterior().dimension(), 0 ) );
-                est.set_parameters ( A ( 0 )->_e()->mean(), A ( 0 )->_e()->_R() );
+                est.set_parameters ( A ( 0 )->posterior().mean(), A ( 0 )->posterior()._R() );
         }
         void bayes ( const vec &dt ) {
@@ -439 +434 @@
                 case 1: {
                         int mi = max_index ( w );
-                        const enorm<chmat>* st = ( Models ( mi )->_e() );
-                        est.set_parameters ( st->mean(), st->_R() );
+                        const enorm<chmat> &st = Models ( mi )->posterior() ;
+                        est.set_parameters ( st.mean(), st._R() );
                 }
                 break;
@@ -451 +446 @@
                 }
         }
-        //all posterior densities are equal => return the first one
-        const enorm<chmat>* _e() const {
-                return &est;
-        }
-        //all posterior densities are equal => return the first one
+        //! posterior density
         const enorm<chmat>& posterior() const {
                 return est;

library/bdm/estim/mixtures.h

@@ -21 +21 @@
 namespace bdm {
 
+//! enum switch for internal approximation used in MixEF
 enum MixEF_METHOD { EM = 0, QB = 1};
 
@@ -118 +119 @@
                 return *est;
         }
-        const eprod* _e() const {
-                return est;
-        }
         emix* epredictor() const;
         //! Flatten the density as if it was not estimated from the data

library/bdm/estim/particles.h

@@ -111 +111 @@
                         dim = E.dimension() + A ( 0 )->posterior().dimension();
                         for ( int i = 0; i < _w.length() ; i++ ) {
-                                Coms ( i ) = A ( i )->_e();
+                                Coms ( i ) = &(A ( i )->posterior());
                         }
                 }
@@ -218 +218 @@
                 return jest;
         }
-        const epdf* _e() const {
-                return &jest;    //Fixme: is it useful?
-        }
         //! Set postrior of \c rvc to samples from epdf0. Statistics of BMs are not re-computed! Use only for initialization!
         /*      void set_est ( const epdf& epdf0 ) {
@@ -234 +231 @@
 
         //!Access function
-        BM* _BM ( int i ) {
+        const BM* _BM ( int i ) {
                 return BMs ( i );
         }