Changeset 489 for library/bdm/base/bdmbase.h

Timestamp:

08/08/09 13:43:16 (15 years ago)

Author:

smidl

Message:

Mpdf redesing is complet - all tests pass (except mlnorm<chmat> which is irrelevant)

Files:

• library/bdm/base/bdmbase.h (modified) (5 diffs)

library/bdm/base/bdmbase.h

@@ -419 +419 @@
                         ep = &iepdf;
                 }
+                void set_ep (epdf *iepdfp) {
+                        ep = iepdfp;
+                }
 
         public:
@@ -436 +439 @@
 
                 //! Returns \param N samples from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv
-                virtual mat samplecond_m (const vec &cond, int N) {it_error ("Not implemented");return mat();}
+                virtual mat samplecond_m (const vec &cond, int N) {
+                        mat M(dimension(), N);
+                        for(int i=0;i<N;i++){M.set_col(i, samplecond(cond));}
+                        return M;
+                }
 
 
@@ -443 +450 @@
 
                 //! Matrix version of evallogcond
-                virtual vec evallogcond_m (const mat &Dt, const vec &cond) {it_error ("Not implemented");return vec (0);}
+                virtual vec evallogcond_m (const mat &Dt, const vec &cond) {
+                        vec v(Dt.cols());
+                        for(int i=0;i<Dt.cols();i++){v(i)= evallogcond(Dt.get_col(i),cond);}
+                        return v;
+                }
 
                 //! Array<vec> version of evallogcond
@@ -718 +729 @@
 {
 
-                shared_ptr<epdf> ipdf;
+                shared_ptr<epdf> iepdf;
         public:
                 //!Default constructor
@@ -724 +735 @@
 
                 mepdf (shared_ptr<epdf> em) {
-                        ipdf = em;
-                        set_ep (*ipdf.get());
+                        iepdf = em;
+                        set_ep (*iepdf.get());
                         dimc = 0;
                 }
 
                 //! empty
-                void condition (const vec &cond);
+                vec samplecond(const vec &cond){return iepdf->sample();}
+                double evallogcond(const vec &val, const vec &cond){return iepdf->evallog(val);}
 
                 //! Load from structure with elements: