Changeset 201 for tests

Show
Ignore:
Timestamp:
11/10/08 15:40:25 (16 years ago)
Author:
smidl
Message:

oprava ARX a prejmenovani sampleN na sample_m

Location:
tests
Files:
1 added
4 modified

Legend:

Unmodified
Added
Removed

  • tests/CMakeLists.txt

    r193 r201  
    4040# ESTIM TESTS 
    4141TEST(arx_test) 
     42TEST(arx_elem_test) 
    4243TEST(merger_test) 
    4344TEST(merger_iter_test) 

  • tests/emix_test.cpp

    r193 r201  
    7777        vec ll ( N ); 
    7878        vec ll2 ( N ); 
    79         mat Smp=M2.sampleN ( N ); 
     79        mat Smp=M2.sample_m ( N ); 
    8080        ll = M2.evalpdflog_m(Smp); 
    8181         

  • tests/mixef_test.cpp

    r191 r201  
    6363        // Sample parameters 
    6464        int ndat = 100; 
    65         mat Smp =Simul.sampleN ( ndat ); 
     65        mat Smp =Simul.sample_m ( ndat ); 
    6666 
    6767        cout << "Simulated means: " << m1 <<" and " << m2 <<endl; 

  • tests/testSmp.cpp

    r179 r201  
    5353        eG.set_parameters(a,b); 
    5454         
    55         cout << eG.eval(a)<<endl; 
    56         Smp = eG.sampleN(N); 
     55        cout << eG.evalpdflog(a)<<endl; 
     56        Smp = eG.sample_m(N); 
    5757 
    5858        vec g_mu = elem_div(a,b); 
    … …  
    7676        eMix.set_parameters(vec_2(0.5,0.5), Coms); 
    7777        vec smp = eMix.sample(); 
    78         Smp = eMix.sampleN(N); 
     78        Smp = eMix.sample_m(N); 
    7979        disp(eMix.mean(),zeros(2),Smp); 
    8080