Changeset 1013 for library/bdm/stat

Timestamp:

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

Author:

smidl

Message:

Flatten has an extra argument

Location:

library/bdm/stat

Files:

• exp_family.cpp (modified) (2 diffs)
• exp_family.h (modified) (2 diffs)

library/bdm/stat/exp_family.cpp

@@ -377 +377 @@
         return pred.lognc() - lll;
 }
-void multiBM::flatten ( const BMEF* B ) {
+void multiBM::flatten ( const BMEF* B, double weight=1.0 ) {
         const multiBM* E = dynamic_cast<const multiBM*> ( B );
         // sum(beta) should be equal to sum(B.beta)
         const vec &Eb = E->beta;//const_cast<multiBM*> ( E )->_beta();
-        beta *= ( sum ( Eb ) / sum ( beta ) );
+        beta *= ( sum ( Eb ) / sum ( beta ) * weight);
         if ( evalll ) {
                 last_lognc = est.lognc();
@@ -768 +768 @@
                 dimc = _beta.length();
         }
-
-};
+}

library/bdm/stat/exp_family.h

@@ -99 +99 @@
 
         //!Flatten the posterior according to the given BMEF (of the same type!)
-        virtual void flatten ( const BMEF * B ) NOT_IMPLEMENTED_VOID;
+        virtual void flatten ( const BMEF * B, double weight=1.0 ) NOT_IMPLEMENTED_VOID;;
 
 
@@ -620 +620 @@
         double logpred ( const vec &yt ) const;
 
-        void flatten ( const BMEF* B );
+        void flatten ( const BMEF* B , double weight);
 
         //! return correctly typed posterior (covariant return)