Changeset 1079 for library/tests

Show
Ignore:
Timestamp:
06/10/10 21:54:57 (14 years ago)
Author:
smidl
Message:

Changes in merger + change in loading ARX

Location:
library/tests/testsuite
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • library/tests/testsuite/merger.cfg

    r717 r1079  
    1212  { 
    1313      class = "egiw"; 
    14       V = ( "matrix", 2, 2, [ 20.0, 8.0, 8.0, 4.0 ] ); 
     14      fV = ( "matrix", 2, 2, [ 20.0, 8.0, 8.0, 4.0 ] ); 
    1515      nu = 4.0; 
    1616      dimx = 1.0; 
    … …  
    2929Merger :  
    3030{ 
    31   class = "merger_base"; 
     31  class = "MergerDiscrete"; 
    3232  beta = 1.0; 
    3333  method = "geometric"; 

  • library/tests/testsuite/merger_test.cpp

    r1072 r1079  
    4747    lW.set_row ( 1, l_f2 ); 
    4848 
    49     merger_base M ( A ); 
     49    MergerDiscrete M ( A ); 
    5050    enorm<fsqmat> g0; 
    5151    g0.set_rv ( x ); 
    … …  
    153153    UIFile in ( "merger.cfg" ); 
    154154 
    155     shared_ptr<merger_base> mb = 
    156         UI::build<merger_base> ( in, "Merger", UI::compulsory ); 
     155    shared_ptr<MergerDiscrete> mb = 
     156        UI::build<MergerDiscrete> ( in, "Merger", UI::compulsory ); 
    157157 
    158158    pdf_array sources; 
    … …  
    165165 
    166166    mb->merge(); 
    167     vec m = mb->mean(); 
     167    vec m = mb->merger().mean(); 
    168168    CHECK_EQUAL ( 2, m.size() ); 
    169169}