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

Timestamp:

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

Author:

smidl

Message:

changes in bayes_batch

Files:

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

library/bdm/estim/mixtures.h

@@ -63 +63 @@
         MixEF_METHOD method;
 
+        //! maximum number of iterations
+        int max_niter;
 public:
         //! Full constructor
         MixEF ( const Array<BMEF*> &Coms0, const vec &alpha0 ) :
                         BMEF ( ), Coms ( Coms0.length() ),
-                        weights (), est(*this), method ( QB ) {
+                        weights (), est(*this), method ( QB ), max_niter(10) {
                 for ( int i = 0; i < Coms0.length(); i++ ) {
                         Coms ( i ) = ( BMEF* ) Coms0 ( i )->_copy();
@@ -78 +80 @@
         MixEF () :
                         BMEF ( ), Coms ( 0 ),
-                        weights (), est(*this), method ( QB ) {
+                        weights (), est(*this), method ( QB ), max_niter(10) {
         }
         //! Copy constructor
         MixEF ( const MixEF &M2 ) : BMEF ( ),  Coms ( M2.Coms.length() ),
-                        weights ( M2.weights ), est(*this), method ( M2.method ) {
+                        weights ( M2.weights ), est(*this), method ( M2.method ), max_niter(M2.max_niter) {
                 for ( int i = 0; i < M2.Coms.length(); i++ ) {
                         Coms ( i ) = (BMEF*) M2.Coms ( i )->_copy();
@@ -99 +101 @@
         void bayes ( const mat &yt, const vec &cond );
         //! batch weighted Bayes rule
-        void bayes_batch ( const mat &yt, const mat &cond, const vec &wData );
-        double logpred ( const vec &yt ) const;
+        double bayes_batch ( const mat &yt, const mat &cond, const vec &wData );
+        double logpred ( const vec &yt, const vec &cond ) const;
         //! return correctly typed posterior (covariant return)
         const eprod_mix& posterior() const {