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/epdf_harness.cpp

    r706 r713  
    9595                } 
    9696 
    97                 vec lpzv_act = hepdf->evallog_m ( zero1n ); 
     97                vec lpzv_act = hepdf->evallog_mat ( zero1n ); 
    9898                CHECK_CLOSE_EX ( lpzv, lpzv_act, tolerance ); 
    9999 
     
    105105                } 
    106106 
    107                 lpzv_act = hepdf->evallog_m ( zeroa ); 
     107                lpzv_act = hepdf->evallog_mat ( zeroa ); 
    108108                CHECK_CLOSE_EX ( lpzv, lpzv_act, tolerance ); 
    109109        } 
     
    162162        Array<vec> actual(CurrentContext::max_trial_count); 
    163163        do { 
    164                 mat smp = hepdf->sample_m ( nsamples ); 
     164                mat smp = hepdf->sample_mat ( nsamples ); 
    165165                vec emu = smp * ones ( nsamples ) / nsamples; 
    166166                actual( tc ) = emu; 
     
    183183        Array<mat> actual(CurrentContext::max_trial_count); 
    184184        do { 
    185                 mat smp = hepdf->sample_m ( nsamples ); 
     185                mat smp = hepdf->sample_mat ( nsamples ); 
    186186                vec emu = smp * ones ( nsamples ) / nsamples; 
    187187                mat er = ( smp * smp.T() ) / nsamples - outer_product ( emu, emu ); 
     
    208208        Array<vec> actual(CurrentContext::max_trial_count); 
    209209        do { 
    210                 mat smp = mep.samplecond_m ( vec ( 0 ), nsamples ); 
     210                mat smp = mep.samplecond_mat ( vec ( 0 ), nsamples ); 
    211211                vec emu = sum ( smp, 2 ) / nsamples; 
    212212                actual( tc ) = emu; 
     
    229229        Array<mat> actual(CurrentContext::max_trial_count); 
    230230        do { 
    231                 mat smp = mep.samplecond_m ( vec ( 0 ), nsamples ); 
     231                mat smp = mep.samplecond_mat ( vec ( 0 ), nsamples ); 
    232232                vec emu = sum ( smp, 2 ) / nsamples; 
    233233                mat er = ( smp * smp.T() ) / nsamples - outer_product ( emu, emu );