Changeset 211 for tests

Timestamp:

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

Author:

smidl

Message:

prejmenovani evalpdflog a evalcond

Location:

tests

Files:

• arx_elem_test.cpp (modified) (1 diff)
• arx_test.cpp (modified) (1 diff)
• blas_test.cpp (modified) (1 diff)
• egiw_test.cpp (modified) (2 diffs)
• emix_test.cpp (modified) (4 diffs)
• enorm_test.cpp (modified) (2 diffs)
• merger_2d_test.cpp (modified) (2 diffs)
• merger_iter_test.cpp (modified) (1 diff)
• merger_test.cpp (modified) (2 diffs)
• test0.cpp (modified) (1 diff)
• testSmp.cpp (modified) (5 diffs)

tests/arx_elem_test.cpp

@@ -40 +40 @@
         
         mlstudent* Ap = Ar.predictor_student(RV("{y }"),RV("{1 }"));
-        vec Ap_x=Ap->evalcond_m(X,vec_1(1.0));
+        vec Ap_x=Ap->evallogcond_m(X,vec_1(1.0));
         vec ll_x = Ar.logpred_m(X2);
         

tests/arx_test.cpp

@@ -41 +41 @@
                 cout << "y: " << Yt(t) << endl;
                 mlstudent*      Pr = Ar.predictor_student(RV("{y }"),RV("{y1 y2 y3 y4 }"));
-                cout << Ar._ll() <<" , " << log(Pr->evalcond(vec_1(Yt(t)),rgr)) <<endl;
+                cout << Ar._ll() <<" , " << log(Pr->evallogcond(vec_1(Yt(t)),rgr)) <<endl;
                 delete Pr;
         }

tests/blas_test.cpp

@@ -6 +6 @@
 using std::cout;
 using std::endl;
+
+//#define NDEBUG
 
 mat matmul ( mat &A, mat &B ) {

tests/egiw_test.cpp

@@ -44 +44 @@
                                 t_val ( 1 ) = Si ( j );
 
-                                pdf ( i,j ) =E.evalpdflog ( t_val );
+                                pdf ( i,j ) =E.evallog ( t_val );
                         }
                 }
@@ -97 +97 @@
                                         t_val ( 2 ) = ( j+1 ) * ( 1.0/n ) *2.0;
 
-                                        Tmp ( i,j ) = E.evalpdflog ( t_val );
+                                        Tmp ( i,j ) = E.evallog ( t_val );
                                 }
                         }

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;

tests/enorm_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 ) );
                 }
         }
@@ -73 +73 @@
         
         cout << endl << " test of pdflog at zero "<<endl;
-        cout << "original: " << exp(E.evalpdflog(vec("0 0"))) <<endl;
-        cout << "composite: " << mEp.evalcond(vec("0 0"),vec(0)) << endl;
+        cout << "original: " << exp(E.evallog(vec("0 0"))) <<endl;
+        cout << "composite: " << mEp.evallogcond(vec("0 0"),vec(0)) << endl;
 }

tests/merger_2d_test.cpp

@@ -52 +52 @@
         emix* MP = MM.predictor(xy);
         
-        vec Res1 = M.evalpdflog_m(Grid);
-        mat Res2 = (MP)->evalpdflog_M(Grid);
+        vec Res1 = M.evallog_m(Grid);
+        mat Res2 = (MP)->evallog_M(Grid);
         
         it_file it("merger_2d_test.it");
@@ -60 +60 @@
         it << Name("Res1") << Res1;
         it << Name("Res2") << Res2;
-        it << Name("S1") << f1.evalpdflog_m(Grid);
-        it << Name("S2") << f2.evalpdflog_m(Grid);
+        it << Name("S1") << f1.evallog_m(Grid);
+        it << Name("S2") << f2.evallog_m(Grid);
         cout << ((enorm<ldmat>*)(MP->_Coms(0)))->_R().to_mat() << endl;
 }

tests/merger_iter_test.cpp

@@ -54 +54 @@
         epdf* MP = MM.predictor(xy);
         
-        vec Res1 = M.evalpdflog_m(Grid);
-        mat Res2 = ((emix*)MP)->evalpdflog_M(Grid);
+        vec Res1 = M.evallog_m(Grid);
+        mat Res2 = ((emix*)MP)->evallog_M(Grid);
         
         it_file it("merger_iter_test.it");

tests/merger_test.cpp

@@ -33 +33 @@
         x_grid.set_row ( 0,linspace ( -10.0, 10.0 ) );
 
-        vec l_f1=f1.evalpdflog_m ( x_grid );
+        vec l_f1=f1.evallog_m ( x_grid );
 
-        vec l_f2=f2.evalpdflog_m ( x_grid );
+        vec l_f2=f2.evallog_m ( x_grid );
         mat lW(2,Npoints);
         lW.set_row(0, l_f1);
@@ -48 +48 @@
         
         vec m2 = M.lognorm_merge(lW);
-        vec mm2 = M.evalpdflog_m(x_grid);
+        vec mm2 = M.evallog_m(x_grid);
         
         it_file it("merger_test.it");

tests/test0.cpp

@@ -21 +21 @@
                                          "3 4 5 6");
         vec v = "1 -1 3 -1";
-        
+                
         cout << "Test to_mat"<<endl;
 //      cout << ld << endl;

tests/testSmp.cpp

@@ -43 +43 @@
         mlnorm<ldmat> ML(x,x);
         ML.set_parameters(I,zeros(2),R);
-        Smp = ML.samplecond(mu0,lik,N);
+        Smp = ML.samplecond_m(mu0,lik,N);
         
         disp(mu0,R.to_mat(),Smp);
@@ -53 +53 @@
         eG.set_parameters(a,b);
         
-        cout << eG.evalpdflog(a)<<endl;
+        cout << eG.evallog(a)<<endl;
         Smp = eG.sample_m(N);
 
@@ -65 +65 @@
         mG.set_parameters(k);
 
-        Smp=mG.samplecond(mu0,lik,N);
+        Smp=mG.samplecond_m(mu0,lik,N);
         disp(mu0,pow(mu0,2.0)/k,Smp);
         
@@ -82 +82 @@
         mepdf meMix(&eMix);
         
-        Smp = meMix.samplecond(mu0,lik,N);
+        Smp = meMix.samplecond_m(mu0,lik,N);
         disp(eMix.mean(),zeros(2),Smp);
 
@@ -94 +94 @@
         mMix.set_parameters(vec_2(0.5,0.5),mComs);
         
-        Smp = mMix.samplecond(mu0,lik,N);
+        Smp = mMix.samplecond_m(mu0,lik,N);
         disp(mMix._epdf().mean(),zeros(2),Smp);