Changeset 682

Timestamp:

10/27/09 16:52:32 (15 years ago)

Author:

mido

Message:

bayesB renamed to bayes_batch

Location:

library

Files:

• bdm/base/bdmbase.cpp (modified) (1 diff)
• bdm/base/bdmbase.h (modified) (1 diff)
• bdm/estim/mixtures.cpp (modified) (3 diffs)
• bdm/estim/mixtures.h (modified) (1 diff)
• bdm/stat/merger.cpp (modified) (1 diff)
• doc/local/Intro.dox (modified) (1 diff)
• tests/arx_elem_test.cpp (modified) (1 diff)
• tests/tutorial/arx_simple.cpp (modified) (1 diff)

library/bdm/base/bdmbase.cpp

@@ -386 +386 @@
 }
 
-void BM::bayesB ( const mat &Data ) {
+void BM::bayes_batch ( const mat &Data ) {
         for ( int t = 0; t < Data.cols(); t++ ) {
                 bayes ( Data.get_col ( t ) );

library/bdm/base/bdmbase.h

@@ -1080 +1080 @@
         virtual void bayes ( const vec &yt, const vec &cond=empty_vec ) = 0;
         //! Batch Bayes rule (columns of Dt are observations)
-        virtual void bayesB ( const mat &Dt );
+        virtual void bayes_batch ( const mat &Dt );
         //! Evaluates predictive log-likelihood of the given data record
         //! I.e. marginal likelihood of the data with the posterior integrated out. 

library/bdm/estim/mixtures.cpp

@@ -17 +17 @@
         Coms ( 0 ) = Com0->_copy_();
 //      Coms(0)->set_evalll(false);
-        Coms ( 0 )->bayesB ( Data );
+        Coms ( 0 )->bayes_batch ( Data );
         // Flatten it to its original shape
         Coms ( 0 )->flatten ( Com0 );
@@ -41 +41 @@
 }
 
-void MixEF::bayesB ( const mat &data , const mat &cond, const vec &wData ) {
+void MixEF::bayes_batch ( const mat &data , const mat &cond, const vec &wData ) {
         int ndat = data.cols();
         int t, i, niter;
@@ -127 +127 @@
 
 void MixEF::bayes ( const mat &data, const vec &cond=empty_vec ) {
-        this->bayesB ( data, cond, ones ( data.cols() ) );
+        this->bayes_batch ( data, cond, ones ( data.cols() ) );
 };
 

library/bdm/estim/mixtures.h

@@ -112 +112 @@
         void bayes ( const mat &yt, const vec &cond );
         //! batch weighted Bayes rule 
-        void bayesB ( const mat &yt, const mat &cond, const vec &wData );
+        void bayes_batch ( const mat &yt, const mat &cond, const vec &wData );
         double logpred ( const vec &yt ) const;
         //! return correctly typed posterior (covariant return)

library/bdm/stat/merger.cpp

@@ -103 +103 @@
                 //Re-Initialize Mixture model
                 Mix.flatten ( &Mix_init );
-                Mix.bayesB ( Smp_ex,empty_vec, w*Npoints );
+                Mix.bayes_batch ( Smp_ex,empty_vec, w*Npoints );
                 delete Mpred;
                 Mpred = Mix.epredictor ( ); // Allocation => must be deleted at the end!!

library/doc/local/Intro.dox

@@ -29 +29 @@
 
 On-line estimation is implemented by method \code void bayes(vec dt)\endcode
-Off-line estimation is implemented by method \code void bayesB(mat D)\endcode
+Off-line estimation is implemented by method \code void bayes_batch(mat D)\endcode
 
 As an intermediate product, the bayes rule computes marginal likelihood of the data records \f$ f(D) \f$.

library/tests/arx_elem_test.cpp

@@ -23 +23 @@
         Smp.set_row ( 0, smp );
         //
-        Ar.bayesB ( Smp );
+        Ar.bayes_batch ( Smp );
         // Ar is now filled with estimates of N(0,1);
         cout << "Empirical moments: mu=" << sum ( smp ) / ndat << ", R=" << sum_sqr ( smp ) / ndat - pow ( sum ( smp ) / ndat, 2 ) << endl;

library/tests/tutorial/arx_simple.cpp

@@ -13 +13 @@
         // forgetting is default: 1.0
         mat Data = concat_vertical ( randn ( 1, 100 ), ones ( 1, 100 ) );
-        Ar.bayesB ( Data );
+        Ar.bayes_batch ( Data );
 
         cout << "Expected value of Theta is: " << Ar.posterior().mean() << endl;