Changeset 386 for library

Show
Ignore:
Timestamp:
06/19/09 11:14:47 (16 years ago)
Author:
mido
Message:

possibly broken? 4th part

Location:
library
Files:
20 modified
9 copied
9 moved

Legend:

Unmodified
Added
Removed
  • library/tests/CMakeLists.txt

    r357 r386  
    1212EXEC(datalink_test) 
    1313EXEC(loggers_test) 
    14 EXEC(testUI) 
     14EXEC(test_user_info) 
    1515 
    1616EXEC(chmat_test) 
     
    1919EXEC(enorm_test) 
    2020EXEC(egiw_test) 
    21 EXEC(emix_test) 
     21EXEC(stat_mixtures_test) 
    2222EXEC(test0) 
    2323EXEC(testResample) 
     
    2929EXEC(merger_2d_test) 
    3030EXEC(merger_iter_test) 
    31 EXEC(mixef_test) 
     31EXEC(estim_mixtures_test) 
    3232 
    33 EXEC(testKF) 
    34 EXEC(testPF) 
     33EXEC(test_kalman) 
     34EXEC(test_particle) 
    3535EXEC(testSmp) 
    3636EXEC(testEpdf) 
    37 EXEC(testKF_QR) 
    38 EXEC(testKF_QRexh) 
     37EXEC(test_kalman_QR) 
     38EXEC(test_kalman_QRexh) 
    3939 
    4040EXEC(blas_test) 
  • library/tests/arx_elem_test.cpp

    r278 r386  
    1 #include <estim/arx.h> 
     1#include "estim/arx.h" 
    22using namespace bdm; 
    33 
  • library/tests/arx_test.cpp

    r271 r386  
    1111 */ 
    1212 
    13 #include <estim/arx.h> 
     13#include "estim/arx.h" 
    1414using namespace bdm; 
    1515 
  • library/tests/chmat_test.cpp

    r294 r386  
    11 
    2 #include <math/chmat.h> 
     2#include "math/chmat.h" 
    33 
    44using namespace itpp; 
  • library/tests/datalink_test.cpp

    r288 r386  
    1 #include "../bdm/stat/libEF.h" 
     1#include "../bdm/stat/exp_family.h" 
    22using namespace bdm; 
    33 
  • library/tests/egiw_test.cpp

    r278 r386  
    1 #include <stat/libEF.h> 
     1#include "stat/exp_family.h" 
    22using namespace bdm; 
    33 
  • library/tests/enorm_test.cpp

    r278 r386  
    1 #include <stat/libEF.h> 
    2 #include <stat/emix.h> 
     1#include "stat/exp_family.h" 
     2#include "stat/mixtures.h" 
    33using namespace bdm; 
    44 
  • library/tests/estim_mixtures_test.cpp

    r278 r386  
    1 #include <estim/mixef.h> 
    2 #include <estim/arx.h> 
    3 #include <stat/libEF.h> 
     1#include "estim/mixtures.h" 
     2#include "estim/arx.h" 
     3#include "stat/exp_family.h" 
    44using namespace bdm; 
    55 
  • library/tests/fsqmat_test.cpp

    r262 r386  
    11 
    2 #include <math/libDC.h> 
     2#include "math/square_mat.h" 
    33 
    44using namespace itpp; 
  • library/tests/ldmat_test.cpp

    r262 r386  
    11 
    2 #include <math/libDC.h> 
     2#include <math/square_mat.h> 
    33 
    44using namespace itpp; 
  • library/tests/loggers_test.cpp

    r262 r386  
    11 
    2 #include <stat/loggers.h> 
     2#include "base/loggers.h" 
    33 
    44using namespace bdm; 
  • library/tests/merger_2d_test.cpp

    r278 r386  
    11 
    2 #include <stat/libEF.h> 
    3 #include <estim/merger.h> 
     2#include "stat/exp_family.h" 
     3#include "stat/merger.h" 
     4 
     5using namespace bdm; 
    46 
    57using namespace bdm; 
     
    4244        Grid.set_submatrix ( 1,0, kron(ones(1,Npoints), y_grid) ); 
    4345         
    44         merger M ( A ); 
     46        merger_mix M ( A ); 
    4547        enorm<fsqmat> g0; g0.set_rv(xy); 
    4648        g0.set_parameters(vec("1 1"),mat("10 0; 0 10")); 
    4749         
    48         M.set_parameters(1e8,400,1); 
    49         M.merge(&g0); 
     50        M.set_parameters(1); 
     51        M.set_method(LOGNORMAL,1e8); 
     52        M.set_support(g0,400); 
     53        M.merge(); 
    5054         
    5155        MixEF &MM = M._Mix(); 
  • library/tests/merger_iter_test.cpp

    r278 r386  
    11 
    2 #include <stat/libEF.h> 
    3 #include <estim/merger.h> 
     2#include "stat/exp_family.h" 
     3#include "stat/merger.h" 
     4 
     5using namespace bdm; 
    46 
    57using namespace bdm; 
     
    4446        Grid.set_submatrix ( 1,0, kron(ones(1,Npoints), y_grid) ); 
    4547         
    46         merger M ( A ); 
     48        merger_mix M ( A ); 
    4749        enorm<fsqmat> g0; g0.set_rv(xy); 
    4850        g0.set_parameters(vec("4 4"),mat("1 0; 0 1")); 
    4951         
    50         M.set_parameters(1.2,400,5); 
    51         M.merge(&g0); 
     52        M.set_parameters(5); 
     53        M.set_method(LOGNORMAL,1.2); 
     54        M.set_support(g0,400); 
     55        M.merge(); 
    5256         
    5357        MixEF &MM = M._Mix(); 
  • library/tests/merger_test.cpp

    r278 r386  
    11 
    2 #include <stat/libEF.h> 
    3 #include <estim/merger.h> 
     2#include "stat/exp_family.h" 
     3#include "stat/merger.h" 
    44 
    55using namespace bdm; 
     
    3434 
    3535        vec l_f1=f1.evallog_m ( x_grid ); 
    36  
    3736        vec l_f2=f2.evallog_m ( x_grid ); 
    3837        mat lW ( 2,Npoints ); 
     
    4039        lW.set_row ( 1, l_f2 ); 
    4140 
    42         merger M ( A ); 
     41        merger_base M ( A ); 
    4342        enorm<fsqmat> g0; g0.set_rv ( x ); 
    4443        g0.set_parameters ( vec ( "0.0" ),mat ( "100.0" ) ); 
    4544 
    46         M.set_parameters ( 1.2,200,3 ); 
    47         M.merge ( &g0 ); 
     45        M.set_method (  LOGNORMAL, 1.2 ); 
     46        M.set_support(g0,200); 
     47        M.merge (); 
    4848 
    49         vec m2 = M.lognorm_merge ( lW ); 
    50         vec mm2 = M.evallog_m ( x_grid ); 
     49        vec m2 = M.merge_points ( lW ); 
     50//      vec mm2 = M.evallog_m ( x_grid ); 
    5151 
    5252        it_file it ( "merger_test.it" ); 
     
    5555        it << Name ( "lf2" ) << l_f2; 
    5656        it << Name ( "m2" ) << m2; 
    57         it << Name ( "mm2" ) << mm2; 
     57//      it << Name ( "mm2" ) << mm2; 
    5858} 
  • library/tests/rv_test.cpp

    r278 r386  
    11 
    2 #include "../bdm/stat/libBM.h" 
    3 #include "../bdm/math/libDC.h" 
     2#include "../bdm/base/bdmbase.h" 
     3#include "../bdm/math/square_mat.h" 
    44#include "../bdm/math/chmat.h" 
    55 
  • library/tests/stat_mixtures_test.cpp

    r278 r386  
    1 #include <stat/libEF.h> 
    2 #include <stat/emix.h> 
     1#include "stat/exp_family.h" 
     2#include "stat/mixtures.h" 
    33using namespace bdm; 
    44 
  • library/tests/test0.cpp

    r278 r386  
    11 
    2 #include "../bdm/stat/libBM.h" 
    3 #include "../bdm/math/libDC.h" 
     2#include "../bdm/base/bdmbase.h" 
     3#include "../bdm/math/square_mat.h" 
    44#include "../bdm/math/chmat.h" 
    55 
  • library/tests/testEpdf.cpp

    r278 r386  
    11 
    2 #include <stat/libEF.h> 
     2#include "stat/exp_family.h" 
    33 
    44using namespace bdm; 
  • library/tests/testResample.cpp

    r283 r386  
    11 
    2 #include <estim/libPF.h> 
    3 #include <math/libDC.h> 
    4 #include <stat/libEF.h> 
     2#include "estim/particles.h" 
     3#include "math/square_mat.h" 
     4#include "stat/exp_family.h" 
    55 
    66using namespace bdm; 
  • library/tests/testSmp.cpp

    r294 r386  
    11 
    2 #include <stat/libEF.h> 
    3 #include <stat/emix.h> 
     2#include "stat/exp_family.h" 
     3#include "stat/mixtures.h" 
    44 
    55using namespace bdm; 
  • library/tests/test_kalman.cpp

    r278 r386  
    11 
    2 #include <estim/libKF.h> 
     2#include <estim/kalman.h> 
    33 
    44using namespace bdm; 
  • library/tests/test_kalman_QR.cpp

    r283 r386  
    11 
    2 #include <estim/libKF.h> 
    3 #include <estim/libPF.h> 
     2#include <estim/kalman.h> 
     3#include <estim/particles.h> 
    44 
    55using namespace bdm; 
  • library/tests/test_kalman_QRexh.cpp

    r278 r386  
    11 
    2 #include <estim/libKF.h> 
    3 #include <estim/libPF.h> 
     2#include <estim/kalman.h> 
     3#include <estim/particles.h> 
    44 
    55using namespace bdm; 
  • library/tests/test_particle.cpp

    r283 r386  
    11 
    2 #include <estim/libPF.h> 
    3 #include <math/libDC.h> 
    4 #include <stat/libEF.h> 
     2#include <estim/particles.h> 
     3#include <math/square_mat.h> 
     4#include "stat/exp_family.h" 
    55 
    66using namespace bdm; 
  • library/tests/test_user_info.cpp

    r377 r386  
    11 
    22#include <string> 
    3 #include "user_info.h" 
     3#include "base/user_info.h" 
    44 
    55using std::string; 
     
    197197{ 
    198198  //////////////////////////////////// LOADING //////////////////////////////// 
    199   UI_File in("testUI_in.cfg"); 
     199  UI_File in("test_user_info_input.cfg"); 
    200200  Transport *pepikovo = UI::build<Transport>(in, "pepikovo"); 
    201201  cout << "pepikovo: " << pepikovo->to_string() << endl; 
     
    208208  Transport *kati = UI::build<Transport>(in, "kati"); 
    209209  cout << "kati: " << kati->to_string() << endl; 
     210  cout << endl << "press any key to continue..." << endl; 
    210211  getchar(); 
    211212 
     
    224225 
    225226  cout << "all the transport means were saved correctly" << endl; 
     227  cout << endl << "press any key to end the program" << endl; 
    226228  getchar(); 
    227229  return 0; 
  • library/tests/test_user_info_input.cfg

    r357 r386  
    2929}; 
    3030elisky = "jardovo"; 
    31 kati = "skubankovo@testUI_ex.cfg"; 
     31kati = "skubankovo@test_user_info_external.cfg"; 
  • library/tests/tutorial/arx_simple.cpp

    r278 r386  
    1 #include <estim/arx.h> 
     1#include "estim/arx.h" 
    22using namespace bdm; 
    33         
  • library/tests/tutorial/kalman_simple.cpp

    r278 r386  
    1 #include <estim/libKF.h> 
     1#include "estim/kalman.h" 
    22using namespace bdm; 
    33