Changeset 193 for tests

Show
Ignore:
Timestamp:
10/22/08 10:46:42 (16 years ago)
Author:
smidl
Message:

oprava merger_iter a jeho casti

Location:
tests
Files:
1 added
2 modified

Legend:

Unmodified
Added
Removed
  • tests/CMakeLists.txt

    r190 r193  
    3434TEST(enorm_test) 
    3535TEST(egiw_test) 
     36TEST(emix_test) 
    3637TEST(test0) 
    3738TEST(testResample) 
  • tests/merger_iter_test.cpp

    r190 r193  
    1111int main() { 
    1212 
    13         RNG_randomize(); 
     13        //RNG_randomize(); 
    1414         
    1515        RV x ( "{x }","1" ); 
     
    2121        enorm<fsqmat> f2 ( x ); 
    2222                 
    23         f1.set_parameters ( "0 0",mat ( "0.5 0; 0 0.5" ) ); 
     23        f1.set_parameters ( "3 2",mat ( "0.5 0; 0 0.5" ) ); 
    2424        f2.set_parameters ( "3",mat ( "0.5" ) ); 
    2525         
     
    4444        g0.set_parameters(vec("1 1"),mat("1 0; 0 1")); 
    4545         
    46         M.set_parameters(1.2,200,2); 
     46        M.set_parameters(1.2,100,1); 
    4747        M.merge(&g0); 
    4848