Changeset 690

Timestamp:

11/02/09 13:41:14 (14 years ago)

Author:

smidl

Message:

details

Files:

• applications/bdmtoolbox/tutorial/merging/merge_frag.m (modified) (1 diff)
• library/bdm/base/bdmbase.cpp (modified) (1 diff)
• library/bdm/base/bdmbase.h (modified) (1 diff)

applications/bdmtoolbox/tutorial/merging/merge_frag.m

@@ -1 +1 @@
 % Random Variables
-a=struct('class','RV','names',{{'a'}});
-b=struct('class','RV','names',{{'b'}});
-ab=struct('class','RV','names',{{'a','b'}});
+a=RV({'a'});
+b=RV({'b'});
+ab=RVjoin([a,b]);
 
 % Sources

library/bdm/base/bdmbase.cpp

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

library/bdm/base/bdmbase.h

@@ -1091 +1091 @@
         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 );
+        virtual void 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 );
         //! Evaluates predictive log-likelihood of the given data record
         //! I.e. marginal likelihood of the data with the posterior integrated out.