Show
Ignore:
Timestamp:
11/10/09 11:03:09 (15 years ago)
Author:
mido
Message:

_m changed to _mat

emix.cfg prepared, but it is not yet debugged!

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • library/tests/emix_test.cpp

    r693 r713  
    6868 
    6969        int N = 3; 
    70         mat Smp = M2.sample_m ( N ); 
     70        mat Smp = M2.sample_mat ( N ); 
    7171 
    7272        vec exp_ll ( "-5.0 -2.53563 -2.62171" ); 
    73         vec ll = M2.evallog_m ( Smp ); 
     73        vec ll = M2.evallog_mat ( Smp ); 
    7474        CHECK_CLOSE ( exp_ll, ll, 5.0 ); 
    7575 
    … …  
    115115        Array<vec> actual(CurrentContext::max_trial_count); 
    116116        do { 
    117                 mat smp = distrib_obj.sample_m ( nsamples ); 
     117                mat smp = distrib_obj.sample_mat ( nsamples ); 
    118118                vec emu = sum ( smp, 2 ) / nsamples; 
    119119                actual( tc ) = emu; 
    … …  
    135135        Array<mat> actual(CurrentContext::max_trial_count); 
    136136        do { 
    137                 mat smp = distrib_obj.sample_m ( nsamples ); 
     137                mat smp = distrib_obj.sample_mat ( nsamples ); 
    138138                vec emu = sum ( smp, 2 ) / nsamples; 
    139139                mat er = ( smp * smp.T() ) / nsamples - outer_product ( emu, emu );