Context Navigation

← Previous Changeset
Next Changeset →

Changeset 386

Timestamp:

06/19/09 11:14:47 (15 years ago)

Author:

mido

Message:

possibly broken? 4th part

Files:

: 6 removed
: 20 modified
: 9 copied
: 9 moved

library/matlab (copied) (copied from matlab)
library/system (copied) (copied from system)
library/tests (copied) (copied from tests)
library/tests/CMakeLists.txt (modified) (3 diffs)
library/tests/arx_elem_test.cpp (modified) (1 diff)
library/tests/arx_test.cpp (modified) (1 diff)
library/tests/blas_test.m (copied) (copied from tests/blas_test.m)
library/tests/chmat_test.cpp (modified) (1 diff)
library/tests/datalink_test.cpp (modified) (1 diff)
library/tests/egiw_test.cpp (modified) (1 diff)
library/tests/enorm_test.cpp (modified) (1 diff)
library/tests/estim_mixtures_test.cpp (moved) (moved from tests/mixef_test.cpp) (1 diff)
library/tests/fsqmat_test.cpp (modified) (1 diff)
library/tests/ldmat_test.cpp (modified) (1 diff)
library/tests/loggers_test.cpp (modified) (1 diff)
library/tests/merger_2d_test.cpp (modified) (2 diffs)
library/tests/merger_iter_test.cpp (modified) (2 diffs)
library/tests/merger_test.cpp (modified) (4 diffs)
library/tests/mixef_test.m (copied) (copied from tests/mixef_test.m)
library/tests/rv_test.cpp (modified) (1 diff)
library/tests/stat_mixtures_test.cpp (moved) (moved from tests/emix_test.cpp) (1 diff)
library/tests/stat_mixtures_test.m (copied) (copied from tests/emix_test.m)
library/tests/test0.cpp (modified) (1 diff)
library/tests/testEpdf.cpp (modified) (1 diff)
library/tests/testKF.it (copied) (copied from tests/testKF.it)
library/tests/testKF.m (copied) (copied from tests/testKF.m)
library/tests/testKF_big.m (copied) (copied from tests/testKF_big.m)
library/tests/testResample.cpp (modified) (1 diff)
library/tests/testSmp.cpp (modified) (1 diff)
library/tests/test_kalman.cpp (moved) (moved from tests/testKF.cpp) (1 diff)
library/tests/test_kalman_QR.cpp (moved) (moved from tests/testKF_QR.cpp) (1 diff)
library/tests/test_kalman_QRexh.cpp (moved) (moved from tests/testKF_QRexh.cpp) (1 diff)
library/tests/test_particle.cpp (moved) (moved from tests/testPF.cpp) (1 diff)
library/tests/test_user_info.cpp (moved) (moved from tests/testUI.cpp) (4 diffs)
library/tests/test_user_info_external.cfg (moved) (moved from tests/testUI_ex.cfg)
library/tests/test_user_info_input.cfg (moved) (moved from tests/testUI_in.cfg) (1 diff)
library/tests/tutorial/arx_simple.cpp (modified) (1 diff)
library/tests/tutorial/kalman_simple.cpp (modified) (1 diff)
matlab/blas_test.m (deleted)
matlab/emix_test.m (deleted)
matlab/mixef_test.m (deleted)
matlab/testKF.it (deleted)
matlab/testKF.m (deleted)
matlab/testKF_big.m (deleted)

Legend:

: Unmodified
: Added
: Removed

library/tests/CMakeLists.txt

r357	r386
12	12	EXEC(datalink_test)
13	13	EXEC(loggers_test)
14		EXEC(testUI)
	14	EXEC(test_user_info)
15	15
16	16	EXEC(chmat_test)
…	…
19	19	EXEC(enorm_test)
20	20	EXEC(egiw_test)
21		EXEC(~~emix~~_test)
	21	EXEC(stat_mixtures_test)
22	22	EXEC(test0)
23	23	EXEC(testResample)
…	…
29	29	EXEC(merger_2d_test)
30	30	EXEC(merger_iter_test)
31		EXEC(~~mixef~~_test)
	31	EXEC(estim_mixtures_test)
32	32
33		EXEC(testKF)
34		EXEC(testPF)
	33	EXEC(test_kalman)
	34	EXEC(test_particle)
35	35	EXEC(testSmp)
36	36	EXEC(testEpdf)
37		EXEC(testKF_QR)
38		EXEC(testKF_QRexh)
	37	EXEC(test_kalman_QR)
	38	EXEC(test_kalman_QRexh)
39	39
40	40	EXEC(blas_test)

library/tests/arx_elem_test.cpp

r278	r386
1		#include ~~<estim/arx.h>~~
	1	#include "estim/arx.h"
2	2	using namespace bdm;
3	3

library/tests/arx_test.cpp

r271	r386
11	11	*/
12	12
13		#include ~~<estim/arx.h>~~
	13	#include "estim/arx.h"
14	14	using namespace bdm;
15	15

library/tests/chmat_test.cpp

r294	r386
1	1
2		#include ~~<math/chmat.h>~~
	2	#include "math/chmat.h"
3	3
4	4	using namespace itpp;

library/tests/datalink_test.cpp

r288	r386
1		#include "../bdm/stat/~~libEF~~.h"
	1	#include "../bdm/stat/exp_family.h"
2	2	using namespace bdm;
3	3

library/tests/egiw_test.cpp

r278	r386
1		#include ~~<stat/libEF.h>~~
	1	#include "stat/exp_family.h"
2	2	using namespace bdm;
3	3

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"
3	3	using namespace bdm;
4	4

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"
4	4	using namespace bdm;
5	5

library/tests/fsqmat_test.cpp

r262	r386
1	1
2		#include ~~<math/libDC.h>~~
	2	#include "math/square_mat.h"
3	3
4	4	using namespace itpp;

library/tests/ldmat_test.cpp

r262	r386
1	1
2		#include <math/~~libDC~~.h>
	2	#include <math/square_mat.h>
3	3
4	4	using namespace itpp;

library/tests/loggers_test.cpp

r262	r386
1	1
2		#include ~~<stat/loggers.h>~~
	2	#include "base/loggers.h"
3	3
4	4	using namespace bdm;

library/tests/merger_2d_test.cpp

r278	r386
1	1
2		#include <stat/libEF.h>
3		#include <estim/merger.h>
	2	#include "stat/exp_family.h"
	3	#include "stat/merger.h"
	4
	5	using namespace bdm;
4	6
5	7	using namespace bdm;
…	…
42	44	Grid.set_submatrix ( 1,0, kron(ones(1,Npoints), y_grid) );
43	45
44		merger M ( A );
	46	merger_mix M ( A );
45	47	enorm<fsqmat> g0; g0.set_rv(xy);
46	48	g0.set_parameters(vec("1 1"),mat("10 0; 0 10"));
47	49
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();
50	54
51	55	MixEF &MM = M._Mix();

library/tests/merger_iter_test.cpp

r278	r386
1	1
2		#include <stat/libEF.h>
3		#include <estim/merger.h>
	2	#include "stat/exp_family.h"
	3	#include "stat/merger.h"
	4
	5	using namespace bdm;
4	6
5	7	using namespace bdm;
…	…
44	46	Grid.set_submatrix ( 1,0, kron(ones(1,Npoints), y_grid) );
45	47
46		merger M ( A );
	48	merger_mix M ( A );
47	49	enorm<fsqmat> g0; g0.set_rv(xy);
48	50	g0.set_parameters(vec("4 4"),mat("1 0; 0 1"));
49	51
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();
52	56
53	57	MixEF &MM = M._Mix();

library/tests/merger_test.cpp

r278	r386
1	1
2		#include ~~<stat/libEF.h>~~
3		#include ~~<estim/merger.h>~~
	2	#include "stat/exp_family.h"
	3	#include "stat/merger.h"
4	4
5	5	using namespace bdm;
…	…
34	34
35	35	vec l_f1=f1.evallog_m ( x_grid );
36
37	36	vec l_f2=f2.evallog_m ( x_grid );
38	37	mat lW ( 2,Npoints );
…	…
40	39	lW.set_row ( 1, l_f2 );
41	40
42		merger M ( A );
	41	merger_base M ( A );
43	42	enorm<fsqmat> g0; g0.set_rv ( x );
44	43	g0.set_parameters ( vec ( "0.0" ),mat ( "100.0" ) );
45	44
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 ();
48	48
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 );
51	51
52	52	it_file it ( "merger_test.it" );
…	…
55	55	it << Name ( "lf2" ) << l_f2;
56	56	it << Name ( "m2" ) << m2;
57		it << Name ( "mm2" ) << mm2;
	57	// it << Name ( "mm2" ) << mm2;
58	58	}

library/tests/rv_test.cpp

r278	r386
1	1
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"
4	4	#include "../bdm/math/chmat.h"
5	5

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"
3	3	using namespace bdm;
4	4

library/tests/test0.cpp

r278	r386
1	1
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"
4	4	#include "../bdm/math/chmat.h"
5	5

library/tests/testEpdf.cpp

r278	r386
1	1
2		#include ~~<stat/libEF.h>~~
	2	#include "stat/exp_family.h"
3	3
4	4	using namespace bdm;

library/tests/testResample.cpp

r283	r386
1	1
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"
5	5
6	6	using namespace bdm;

library/tests/testSmp.cpp

r294	r386
1	1
2		#include ~~<stat/libEF.h>~~
3		#include ~~<stat/emix.h>~~
	2	#include "stat/exp_family.h"
	3	#include "stat/mixtures.h"
4	4
5	5	using namespace bdm;

library/tests/test_kalman.cpp

r278	r386
1	1
2		#include <estim/~~libKF~~.h>
	2	#include <estim/kalman.h>
3	3
4	4	using namespace bdm;

library/tests/test_kalman_QR.cpp

r283	r386
1	1
2		#include <estim/~~libKF~~.h>
3		#include <estim/~~libPF~~.h>
	2	#include <estim/kalman.h>
	3	#include <estim/particles.h>
4	4
5	5	using namespace bdm;

library/tests/test_kalman_QRexh.cpp

r278	r386
1	1
2		#include <estim/~~libKF~~.h>
3		#include <estim/~~libPF~~.h>
	2	#include <estim/kalman.h>
	3	#include <estim/particles.h>
4	4
5	5	using namespace bdm;

library/tests/test_particle.cpp

r283	r386
1	1
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"
5	5
6	6	using namespace bdm;

library/tests/test_user_info.cpp

r377	r386
1	1
2	2	#include <string>
3		#include "user_info.h"
	3	#include "base/user_info.h"
4	4
5	5	using std::string;
…	…
197	197	{
198	198	//////////////////////////////////// LOADING ////////////////////////////////
199		UI_File in("test~~UI_in~~.cfg");
	199	UI_File in("test_user_info_input.cfg");
200	200	Transport *pepikovo = UI::build<Transport>(in, "pepikovo");
201	201	cout << "pepikovo: " << pepikovo->to_string() << endl;
…	…
208	208	Transport *kati = UI::build<Transport>(in, "kati");
209	209	cout << "kati: " << kati->to_string() << endl;
	210	cout << endl << "press any key to continue..." << endl;
210	211	getchar();
211	212
…	…
224	225
225	226	cout << "all the transport means were saved correctly" << endl;
	227	cout << endl << "press any key to end the program" << endl;
226	228	getchar();
227	229	return 0;

library/tests/test_user_info_input.cfg

r357	r386
29	29	};
30	30	elisky = "jardovo";
31		kati = "skubankovo@test~~UI_ex~~.cfg";
	31	kati = "skubankovo@test_user_info_external.cfg";

library/tests/tutorial/arx_simple.cpp

r278	r386
1		#include ~~<estim/arx.h>~~
	1	#include "estim/arx.h"
2	2	using namespace bdm;
3	3

library/tests/tutorial/kalman_simple.cpp

r278	r386
1		#include ~~<estim/libKF.h>~~
	1	#include "estim/kalman.h"
2	2	using namespace bdm;
3	3

Context Navigation

Changeset 386

Legend:

Download in other formats: