Changeset 1009 for library/bdm/base/bdmbase.h

Timestamp:

05/27/10 23:07:16 (14 years ago)

Author:

smidl

Message:

changes in bayes_batch

Files:

• library/bdm/base/bdmbase.h (modified) (1 diff)

library/bdm/base/bdmbase.h

@@ -1293 +1293 @@
         @param dt vector of input data
         */
-        virtual void bayes ( const vec &yt, const vec &cond = empty_vec ) = 0;
+        virtual void bayes ( const vec &yt, const vec &cond = empty_vec ) =0;
         //! Batch Bayes rule (columns of Dt are observations)
-        virtual void bayes_batch ( const mat &Dt, const vec &cond = empty_vec );
+        virtual double bayes_batch ( const mat &Dt, const vec &cond = empty_vec );
         //! Batch Bayes rule (columns of Dt are observations, columns of Cond are conditions)
-        virtual void bayes_batch ( const mat &Dt, const mat &Cond );
+        virtual double bayes_batch ( const mat &Dt, const mat &Cond );
         //! Evaluates predictive log-likelihood of the given data record
         //! I.e. marginal likelihood of the data with the posterior integrated out.
         //! This function evaluates only \f$ y_t \f$, condition is assumed to be the last used in bayes().
         //! See bdm::BM::predictor for conditional version.
-        virtual double logpred ( const vec &yt ) const NOT_IMPLEMENTED(0.0);
+        virtual double logpred ( const vec &yt, const vec &cond ) const NOT_IMPLEMENTED(0.0);
 
         //! Matrix version of logpred
-        vec logpred_mat ( const mat &Yt ) const {
+        vec logpred_mat ( const mat &Yt, const mat &Cond ) const {
                 vec tmp ( Yt.cols() );
                 for ( int i = 0; i < Yt.cols(); i++ ) {
-                        tmp ( i ) = logpred ( Yt.get_col ( i ) );
+                        tmp ( i ) = logpred ( Yt.get_col ( i ), Cond.get_col(i) );
                 }
                 return tmp;