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

Timestamp:

11/10/09 11:03:09 (15 years ago)

Author:

mido

Message:

_m changed to _mat

emix.cfg prepared, but it is not yet debugged!

Files:

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

library/bdm/base/bdmbase.h

@@ -429 +429 @@
 
         //! 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 );
+        virtual mat samplecond_mat ( const vec &cond, int N );
 
         //! Shortcut for conditioning and evaluation of the internal epdf. In some cases,  this operation can be implemented efficiently.
@@ -438 +438 @@
 
         //! Matrix version of evallogcond
-        virtual vec evallogcond_m ( const mat &Yt, const vec &cond ) {
+        virtual vec evallogcond_mat ( const mat &Yt, const vec &cond ) {
                 vec v ( Yt.cols() );
                 for ( int i = 0; i < Yt.cols(); i++ ) {
@@ -447 +447 @@
 
         //! Array<vec> version of evallogcond
-        virtual vec evallogcond_m ( const Array<vec> &Yt, const vec &cond ) {
+        virtual vec evallogcond_mat ( const Array<vec> &Yt, const vec &cond ) {
                 bdm_error ( "Not implemented" );
                 return vec();
@@ -534 +534 @@
 
         //! Returns N samples, \f$ [x_1 , x_2 , \ldots \ \f$  from density \f$ f_x(rv)\f$
-        virtual mat sample_m ( int N ) const;
+        virtual mat sample_mat ( int N ) const;
 
         //! Compute log-probability of argument \c val
@@ -544 +544 @@
 
         //! Compute log-probability of multiple values argument \c val
-        virtual vec evallog_m ( const mat &Val ) const;
+        virtual vec evallog_mat ( const mat &Val ) const;
 
         //! Compute log-probability of multiple values argument \c val
-        virtual vec evallog_m ( const Array<vec> &Avec ) const;
+        virtual vec evallog_mat ( const Array<vec> &Avec ) const;
 
         //! Return conditional density on the given RV, the remaining rvs will be in conditioning
@@ -669 +669 @@
         double evallogcond ( const vec &val, const vec &cond );
         //! Efficient version of evallogcond for matrices
-        virtual vec evallogcond_m ( const mat &Dt, const vec &cond );
+        virtual vec evallogcond_mat ( const mat &Dt, const vec &cond );
         //! Efficient version of evallogcond for Array<vec>
-        virtual vec evallogcond_m ( const Array<vec> &Dt, const vec &cond );
+        virtual vec evallogcond_mat ( const Array<vec> &Dt, const vec &cond );
         //! Efficient version of samplecond
-        virtual mat samplecond_m ( const vec &cond, int N );
+        virtual mat samplecond_mat ( const vec &cond, int N );
         
         void validate() {
@@ -1117 +1117 @@
 
         //! Matrix version of logpred
-        vec logpred_m ( const mat &Yt ) const {
+        vec logpred_mat ( const mat &Yt ) const {
                 vec tmp ( Yt.cols() );
                 for ( int i = 0; i < Yt.cols(); i++ ) {
@@ -1253 +1253 @@
 
 template<class EPDF>
-mat pdf_internal<EPDF>::samplecond_m ( const vec &cond, int N ) {
+mat pdf_internal<EPDF>::samplecond_mat ( const vec &cond, int N ) {
         condition ( cond );
         mat temp ( dimension(), N );
@@ -1274 +1274 @@
 
 template<class EPDF>
-vec pdf_internal<EPDF>::evallogcond_m ( const mat &Yt, const vec &cond ) {
+vec pdf_internal<EPDF>::evallogcond_mat ( const mat &Yt, const vec &cond ) {
         condition ( cond );
-        return iepdf.evallog_m ( Yt );
+        return iepdf.evallog_mat ( Yt );
 }
 
 template<class EPDF>
-vec pdf_internal<EPDF>::evallogcond_m ( const Array<vec> &Yt, const vec &cond ) {
+vec pdf_internal<EPDF>::evallogcond_mat ( const Array<vec> &Yt, const vec &cond ) {
         condition ( cond );
-        return iepdf.evallog_m ( Yt );
+        return iepdf.evallog_mat ( Yt );
 }