Changeset 211 for bdm/stat/libBM.h

Timestamp:

11/13/08 20:00:53 (16 years ago)

Author:

smidl

Message:

prejmenovani evalpdflog a evalcond

Files:

• bdm/stat/libBM.h (modified) (4 diffs)

bdm/stat/libBM.h

@@ -126 +126 @@
 RV concat ( const RV &rv1, const RV &rv2 );
 
+//!Default empty RV that can be used as default argument
+extern RV RV0;
 
 //! Class representing function \f$f(x)\f$ of variable \f$x\f$ represented by \c rv
@@ -172 +174 @@
         
         //! Compute log-probability of argument \c val
-        virtual double evalpdflog ( const vec &val ) const =0;
+        virtual double evallog ( const vec &val ) const =0;
 
         //! Compute log-probability of multiple values argument \c val
-        virtual vec evalpdflog_m ( const mat &Val ) const {
+        virtual vec evallog_m ( const mat &Val ) const {
                 vec x ( Val.cols() );
-                for ( int i=0;i<Val.cols();i++ ) {x ( i ) =evalpdflog ( Val.get_col ( i ) ) ;}
+                for ( int i=0;i<Val.cols();i++ ) {x ( i ) =evallog ( Val.get_col ( i ) ) ;}
                 return x;
         }
@@ -217 +219 @@
                 this->condition ( cond );
                 vec temp= ep->sample();
-                ll=ep->evalpdflog ( temp );return temp;
+                ll=ep->evallog ( temp );return temp;
         };
         //! 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 \param ll is a return value of log-likelihood of the sample.
-        virtual mat samplecond ( const vec &cond, vec &ll, int N ) {
+        virtual mat samplecond_m ( const 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 );}
+                for ( int i=0;i<N;i++ ) {smp=ep->sample() ;temp.set_col ( i, smp );ll ( i ) =ep->evallog ( smp );}
                 return temp;
         };
@@ -230 +232 @@
 
         //! Shortcut for conditioning and evaluation of the internal epdf. In some cases,  this operation can be implemented efficiently.
-        virtual double evalcond ( const vec &dt, const vec &cond ) {this->condition ( cond );return exp(ep->evalpdflog ( dt ));};
-
-        virtual vec evalcond_m ( const mat &Dt, const vec &cond ) {this->condition ( cond );return exp(ep->evalpdflog_m ( Dt ));};
+        virtual double evallogcond ( const vec &dt, const vec &cond ) {this->condition ( cond );return ep->evallog ( dt );};
+
+        //! Matrix version of evallogcond
+        virtual vec evallogcond_m ( const mat &Dt, const vec &cond ) {this->condition ( cond );return ep->evallog_m ( Dt );};
 
         //! Destructor for future use;