Changeset 1013 for library/bdm/estim/mixtures.h

Timestamp:

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

Author:

smidl

Message:

Flatten has an extra argument

Files:

• library/bdm/estim/mixtures.h (modified) (2 diffs)

library/bdm/estim/mixtures.h

@@ -98 +98 @@
         //! Recursive EM-like algorithm (QB-variant), see Karny et. al, 2006
         void bayes ( const vec &yt, const vec &cond );
-        //! EM algorithm
-        void bayes ( const mat &yt, const vec &cond );
         //! batch weighted Bayes rule
-        double bayes_batch ( const mat &yt, const mat &cond, const vec &wData );
+        double bayes_batch_weighted ( const mat &yt, const mat &cond, const vec &wData );
+        double bayes_batch ( const mat &yt, const mat &cond){
+                return bayes_batch_weighted(yt,cond,ones(yt.cols()));
+        };
         double logpred ( const vec &yt, const vec &cond ) const;
         //! return correctly typed posterior (covariant return)
@@ -110 +111 @@
         emix* epredictor(const vec &cond=vec()) const;
         //! Flatten the density as if it was not estimated from the data
-        void flatten ( const BMEF* M2 );
+        void flatten ( const BMEF* M2, double weight );
         //! Access function
         BMEF* _Coms ( int i ) {