Changeset 378 for bdm/stat/libEF.h

Timestamp:

06/17/09 23:53:08 (15 years ago)

Author:

smidl

Message:

details and compositepdf changes

Files:

• bdm/stat/libEF.h (modified) (5 diffs)

bdm/stat/libEF.h

@@ -125 +125 @@
                         enorm ( const vec &mu,const sq_T &R ) {set_parameters ( mu,R );}
                         void set_parameters ( const vec &mu,const sq_T &R );
+                        void from_setting(const Setting &root);
                         //!@}
 
@@ -141 +142 @@
 //      mlnorm<sq_T>* condition ( const RV &rvn ) const ; <=========== fails to cmpile. Why?
                         mpdf* condition ( const RV &rvn ) const ;
-        enorm<sq_T>* marginal ( const RV &rv ) const;
+                        enorm<sq_T>* marginal ( const RV &rv ) const;
 //                      epdf* marginal ( const RV &rv ) const;
                         //!@}
@@ -791 +792 @@
          only allow diagonal covariances!
 
-        Density of the form \f$ \log(x)\sim \mathcal{N}(\mu,\sigma^2), i.e.
+        Density of the form \f$ \log(x)\sim \mathcal{N}(\mu,\sigma^2) \f$ , i.e.
         \f[
         x \sim \frac{1}{x\sigma\sqrt{2\pi}}\exp{-\frac{1}{2\sigma^2}(\log(x)-\mu)}
@@ -1017 +1018 @@
                         //!@{
                         eEmp ( ) :epdf ( ),w ( ),samples ( ) {};
+                        //! copy constructor
                         eEmp ( const eEmp &e ) : epdf ( e ), w ( e.w ), samples ( e.samples ) {};
                         //!@}
@@ -1087 +1089 @@
 
         template<class sq_T>
+        void enorm<sq_T>::from_setting(const Setting &root){
+                vec mu;
+                UI::get(mu,root,"mu");
+                mat R;
+                UI::get(R,root,"R");
+                set_parameters(mu,R);
+                
+                RV* r = UI::build<RV>(root,"rv");
+                set_rv(*r); 
+                delete r;
+        }
+
+        template<class sq_T>
         void enorm<sq_T>::dupdate ( mat &v, double nu )
         {