Changeset 211 for tests/emix_test.cpp

Timestamp:

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

Author:

smidl

Message:

prejmenovani evalpdflog a evalcond

Files:

• tests/emix_test.cpp (modified) (4 diffs)

tests/emix_test.cpp

@@ -19 +19 @@
                 for ( double y=yb ( 0 );y<=yb ( 1 );y+=ystep,j++ ) {
                         rgr ( 1 ) =y;
-                        PPdf ( i,j ) =exp ( ep->evalpdflog ( rgr ) );
+                        PPdf ( i,j ) =exp ( ep->evallog ( rgr ) );
                 }
         }
@@ -58 +58 @@
         cout << *((mlnorm<ldmat>*)Ac) <<endl;
         
-        cout << "Mix marg at 0: " << Mm->evalpdflog(vec_1(0.0)) <<endl;
-        cout << "ARX marg at 0: " << Am->evalpdflog(vec_1(0.0)) <<endl;
-        cout << "Mix cond at 0,0: " << Mc->evalcond(vec_1(0.0),vec_1(0.0)) <<endl;
-        cout << "ARX cond at 0,0: " << Ac->evalcond(vec_1(0.0),vec_1(0.0)) <<endl;
+        cout << "Mix marg at 0: " << Mm->evallog(vec_1(0.0)) <<endl;
+        cout << "ARX marg at 0: " << Am->evallog(vec_1(0.0)) <<endl;
+        cout << "Mix cond at 0,0: " << Mc->evallogcond(vec_1(0.0),vec_1(0.0)) <<endl;
+        cout << "ARX cond at 0,0: " << Ac->evallogcond(vec_1(0.0),vec_1(0.0)) <<endl;
         
         cout << "======== Mixture with two components ==="<<endl;
@@ -78 +78 @@
         vec ll2 ( N );
         mat Smp=M2.sample_m ( N );
-        ll = M2.evalpdflog_m(Smp);
+        ll = M2.evallog_m(Smp);
         
         vec Emu = sum ( Smp,2 ) /N;
@@ -102 +102 @@
 
         for (int j=0; j<N; j++){
-                ll2(j)=mEp.evalcond (Smp.get_col(j), vec ( 0 ));
+                ll2(j)=mEp.evallogcond (Smp.get_col(j), vec ( 0 ));
         }
         it << Name("ll") << ll;