Changeset 115 for bdm/stat

Timestamp:

05/23/08 18:47:11 (16 years ago)

Author:

smidl

Message:

zmena mmix_triv na mepdf

Location:

bdm/stat

Files:

• emix.h (modified) (2 diffs)
• libBM.h (modified) (2 diffs)

bdm/stat/emix.h

@@ -48 +48 @@
                 return mu;
         }
-        double evalpdflog ( const vec &val ) const {int i; double sum=0.0; for ( i=0;i<w.length();i++ ) {sum+=w ( i ) *Coms ( i )->evalpdflog ( val );} return log ( sum );};
+        double evalpdflog ( const vec &val ) const {
+                int i;
+                double sum=0.0;
+                for ( i=0;i<w.length();i++ ) {sum+=w ( i ) *Coms ( i )->evalpdflog ( val );}
+                return log ( sum );
+        };
 
 //Access methods
@@ -55 +60 @@
 };
 
-class mmix_triv : public mpdf {
+/*! \brief Chain rule decomposition of epdf
+
+
+*/
+class eprod: public epdf {
+protected:
+        Array<epdf*> epdfs;
+        Array<mpdf*> mpdfs;
 public:
-        //!Default constructor
-        mmix_triv ( const RV &rv, const RV &rvc, emix* em ) :mpdf ( rv,rvc ) {ep=em;};
+        
+        
 };
 

bdm/stat/libBM.h

@@ -171 +171 @@
         virtual mat samplecond ( vec &cond, vec &ll, int N ) {
                 this->condition ( cond );
-                mat temp ( rv.count(),N ); vec smp ( rv.count() ); for ( int i=0;i<N;i++ ) {smp=ep->sample() ;temp.set_col ( i, smp );ll ( i ) =ep->evalpdflog ( smp );}
+                mat temp ( rv.count(),N ); vec smp ( rv.count() ); 
+                for ( int i=0;i<N;i++ ) {smp=ep->sample() ;temp.set_col ( i, smp );ll ( i ) =ep->evalpdflog ( smp );}
                 return temp;
         };
@@ -189 +190 @@
         //!access function
         epdf& _epdf() {return *ep;}
+};
+
+/*! \brief Unconditional mpdf, allows using epdf in the role of mpdf. 
+
+WARNING: the class does not check validity of the \c ep pointer nor its existence.
+*/
+class mepdf : public mpdf {
+public:
+        //!Default constructor
+        mepdf ( const RV &rv, const RV &rvc, epdf* em ) :mpdf ( rv,rvc ) {ep=em;};
 };