Changeset 211 for bdm/stat/libEF.h

Timestamp:

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

Author:

smidl

Message:

prejmenovani evalpdflog a evalcond

Files:

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

bdm/stat/libEF.h

@@ -46 +46 @@
         virtual void dupdate ( mat &v ) {it_error ( "Not implemented" );};
         //!Evaluate normalized log-probability
-        virtual double evalpdflog_nn ( const vec &val ) const{it_error ( "Not implemented" );return 0.0;};
+        virtual double evallog_nn ( const vec &val ) const{it_error ( "Not implemented" );return 0.0;};
         //!Evaluate normalized log-probability
-        virtual double evalpdflog ( const vec &val ) const {double tmp;tmp= evalpdflog_nn ( val )-lognc();it_assert_debug(std::isfinite(tmp),"why?"); return tmp;}
+        virtual double evallog ( const vec &val ) const {double tmp;tmp= evallog_nn ( val )-lognc();it_assert_debug(std::isfinite(tmp),"why?"); return tmp;}
         //!Evaluate normalized log-probability for many samples
-        virtual vec evalpdflog ( const mat &Val ) const {
+        virtual vec evallog ( const mat &Val ) const {
                 vec x ( Val.cols() );
-                for ( int i=0;i<Val.cols();i++ ) {x ( i ) =evalpdflog_nn ( Val.get_col ( i ) ) ;}
+                for ( int i=0;i<Val.cols();i++ ) {x ( i ) =evallog_nn ( Val.get_col ( i ) ) ;}
                 return x-lognc();
         }
@@ -129 +129 @@
         mat sample ( int N ) const;
         double eval ( const vec &val ) const ;
-        double evalpdflog_nn ( const vec &val ) const;
+        double evallog_nn ( const vec &val ) const;
         double lognc () const;
         vec mean() const {return mu;}
@@ -193 +193 @@
         void mean_mat ( mat &M, mat&R ) const;
         //! In this instance, val= [theta, r]. For multivariate instances, it is stored columnwise val = [theta_1 theta_2 ... r_1 r_2 ]
-        double evalpdflog_nn ( const vec &val ) const;
+        double evallog_nn ( const vec &val ) const;
         double lognc () const;
 
@@ -227 +227 @@
         vec mean() const {return beta/sum ( beta );};
         //! In this instance, val is ...
-        double evalpdflog_nn ( const vec &val ) const {return ( beta-1 ) *log ( val );};
+        double evallog_nn ( const vec &val ) const {return ( beta-1 ) *log ( val );};
         double lognc () const {
                 double gam=sum ( beta );
@@ -318 +318 @@
         //! TODO: is it used anywhere?
 //      mat sample ( int N ) const;
-        double evalpdflog ( const vec &val ) const;
+        double evallog ( const vec &val ) const;
         double lognc () const;
         //! Returns poiter to alpha and beta. Potentially dengerous: use with care!
@@ -358 +358 @@
         euni ( const RV rv ) :epdf ( rv ) {}
         double eval ( const vec &val ) const  {return nk;}
-        double evalpdflog ( const vec &val ) const  {return lnk;}
+        double evallog ( const vec &val ) const  {return lnk;}
         vec sample() const {
                 vec smp ( rv.count() );
@@ -538 +538 @@
         vec sample() const {it_error ( "Not implemented" );return 0;}
         //! inherited operation : NOT implemneted
-        double evalpdflog ( const vec &val ) const {it_error ( "Not implemented" );return 0.0;}
+        double evallog ( const vec &val ) const {it_error ( "Not implemented" );return 0.0;}
         vec mean() const {
                 vec pom=zeros ( rv.count() );
@@ -599 +599 @@
 double enorm<sq_T>::eval ( const vec &val ) const {
         double pdfl,e;
-        pdfl = evalpdflog ( val );
+        pdfl = evallog ( val );
         e = exp ( pdfl );
         return e;
@@ -605 +605 @@
 
 template<class sq_T>
-double enorm<sq_T>::evalpdflog_nn ( const vec &val ) const {
+double enorm<sq_T>::evallog_nn ( const vec &val ) const {
         // 1.83787706640935 = log(2pi)
         double tmp=-0.5* ( R.invqform ( mu-val ) );// - lognc();