Changeset 211 for bdm/stat/emix.h

Timestamp:

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

Author:

smidl

Message:

prejmenovani evalpdflog a evalcond

Files:

• bdm/stat/emix.h (modified) (7 diffs)

bdm/stat/emix.h

@@ -32 +32 @@
 In particular this type of arise by conditioning of a mixture model.
 
-At present the only supported operation is evalcond().
+At present the only supported operation is evallogcond().
  */
 class mratio: public mpdf {
@@ -60 +60 @@
                 den = nom->marginal ( rvc );
         };
-        double evalcond ( const vec &val, const vec &cond ) {
+        double evallogcond ( const vec &val, const vec &cond ) {
                 vec nom_val ( rv.count() +rvc.count() );
                 dl.fill_val_cond ( nom_val,val,cond );
-                return exp ( nom->evalpdflog ( nom_val ) - den->evalpdflog ( cond ) );
+                return exp ( nom->evallog ( nom_val ) - den->evallog ( cond ) );
         }
         //! Object takes ownership of nom and will destroy it
@@ -102 +102 @@
                 return mu;
         }
-        double evalpdflog ( const vec &val ) const {
+        double evallog ( const vec &val ) const {
                 int i;
                 double sum = 0.0;
-                for ( i = 0;i < w.length();i++ ) {sum += w ( i ) * exp ( Coms ( i )->evalpdflog ( val ) );}
+                for ( i = 0;i < w.length();i++ ) {sum += w ( i ) * exp ( Coms ( i )->evallog ( val ) );}
                 return log ( sum );
         };
-        vec evalpdflog_m ( const mat &Val ) const {
+        vec evallog_m ( const mat &Val ) const {
                 vec x=zeros ( Val.cols() );
                 for ( int i = 0; i < w.length(); i++ ) {
-                        x+= w ( i ) *exp ( Coms ( i )->evalpdflog_m ( Val ) );
+                        x+= w ( i ) *exp ( Coms ( i )->evallog_m ( Val ) );
                 }
                 return log ( x );
         };
-        mat evalpdflog_M ( const mat &Val ) const {
+        mat evallog_M ( const mat &Val ) const {
                 mat X ( w.length(), Val.cols() );
                 for ( int i = 0; i < w.length(); i++ ) {
-                        X.set_row ( i, w ( i ) *exp ( Coms ( i )->evalpdflog_m ( Val ) ) );
+                        X.set_row ( i, w ( i ) *exp ( Coms ( i )->evallog_m ( Val ) ) );
                 }
                 return X;
@@ -166 +166 @@
         };
 
-        double evalcond ( const vec &val, const vec &cond ) {
+        double evallogcond ( const vec &val, const vec &cond ) {
                 int i;
                 double res = 1.0;
@@ -174 +174 @@
                                                 }
                                                 // add logarithms
-                                                res += epdfs ( i )->evalpdflog ( dls ( i )->get_val ( val ) );*/
-                        res *= mpdfs ( i )->evalcond (
+                                                res += epdfs ( i )->evallog ( dls ( i )->get_val ( val ) );*/
+                        res *= mpdfs ( i )->evallogcond (
                                    dls ( i )->get_val ( val ),
                                    dls ( i )->get_cond ( val, cond )
@@ -196 +196 @@
                         dls ( i )->fill_val ( smp, smpi );
                         // add ith likelihood contribution
-                        ll+=epdfs ( i )->evalpdflog ( smpi );
+                        ll+=epdfs ( i )->evallog ( smpi );
                 }
                 return smp;
@@ -244 +244 @@
                 return tmp;
         }
-        double evalpdflog ( const vec &val ) const {
+        double evallog ( const vec &val ) const {
                 double tmp=0;
                 for ( int i=0;i<epdfs.length();i++ ) {
-                        tmp+=epdfs ( i )->evalpdflog ( dls ( i )->get_val ( val ) );
+                        tmp+=epdfs ( i )->evallog ( dls ( i )->get_val ( val ) );
                 }
                 return tmp;