Changeset 679 for library/tests

Timestamp:

10/23/09 00:05:25 (15 years ago)

Author:

smidl

Message:

Major changes in BM -- OK is only test suite and tests/tutorial -- the rest is broken!!!

Location:

library/tests

Files:

• arx_elem_test.cpp (modified) (2 diffs)
• arx_test.cpp (modified) (3 diffs)
• dirfile-format.matrix (modified) (1 diff)
• mixtures_test.cpp (modified) (2 diffs)
• tutorial/arx_simple.cpp (modified) (1 diff)
• tutorial/kalman_simple.cpp (modified) (1 diff)

library/tests/arx_elem_test.cpp

@@ -9 +9 @@
         ARX Ar;
         Ar.set_statistics ( 1, V0, -1.0 );
+        Ar.set_constant(true);
+        Ar.validate();
 
         mat mu ( 1, 1 );
@@ -36 +38 @@
 
         mlstudent* Ap = Ar.predictor_student();
-        vec Ap_x = Ap->evallogcond_m ( X, vec_1 ( 1.0 ) );
+        vec Ap_x = Ap->evallogcond_m ( X, empty_vec );
         vec ll_x = Ar.logpred_m ( X2 );
 

library/tests/arx_test.cpp

@@ -27 +27 @@
         ARX Ar;
         Ar.set_statistics ( 1, V0, nu0 );               // Estimator
+        Ar.set_constant(false);
+        Ar.validate();
         const epdf& f_thr = Ar.posterior();          // refrence to posterior of the estimator
 
@@ -34 +36 @@
         Yt.set_subvector ( 0, randn ( ord ) ); //initial values
         vec rgr ( ord );                // regressor
-        vec Psi ( ord + 1 );            // extended regressor
 
         //print moments of the prior distribution
@@ -49 +50 @@
                 Yt ( t ) = th * rgr + sqr * NorRNG();
 
-                Psi = concat ( Yt ( t ), rgr ); // Inefficient! Used for compatibility with Matlab!
-                Ar.bayes ( Psi );             // Bayes rule
+                Ar.bayes ( vec_1(Yt(t)), rgr );             // Bayes rule
 
                 // Build predictor

library/tests/dirfile-format.matrix

@@ -1 @@
-r_0 RAW d 1
-r_1 RAW d 1
-th_alog RAW d 1
-th_blog RAW d 1
+r.0 RAW d 1
+r.1 RAW d 1
+th.alog RAW d 1
+th.blog RAW d 1

library/tests/mixtures_test.cpp

@@ -99 +99 @@
         // Add ones for constant coefficients
         mat Data = concat_vertical ( Smp, ones ( 1, Smp.cols() ) );
-        Post.bayes ( Data );
+        Post.bayes ( Data , empty_vec);
 
         cout << "Posterior mixture:" << endl;
@@ -115 +115 @@
         mat PPdf_I = grid2D ( RND, vec_2 ( -5.0, 5.0 ), vec_2 ( -5.0, 5.0 ) );;
 
-        RND.bayes ( Data );
+        RND.bayes ( Data, empty_vec );
         cout << endl << "== BAYES ==" << endl;
         disp_mix2D ( RND );

library/tests/tutorial/arx_simple.cpp

@@ -9 +9 @@
         ARX Ar;
         Ar.set_statistics ( 1, V0 ); //nu is default (set to have finite moments)
+        Ar.set_constant(true);
+        Ar.validate();
         // forgetting is default: 1.0
         mat Data = concat_vertical ( randn ( 1, 100 ), ones ( 1, 100 ) );

library/tests/tutorial/kalman_simple.cpp

@@ -20 +20 @@
         KF.set_parameters ( A, B, C, D,/*covariances*/ Q, R );
         KF.set_statistics ( mu0, P0 );
+        KF.validate();
         // Estimation loop
         for ( int i = 0; i < 100; i++ ) {
-                KF.bayes ( randn ( dx + du ) );
+                KF.bayes ( randn ( dy), randn( du ) );
         }
         //print results