Changeset 722 for library/tests/stresssuite

Timestamp:

11/13/09 16:11:31 (15 years ago)

Author:

mido

Message:

astyler run over all test sources
general_suite added
cleanup of \test directory finished

Location:

library/tests/stresssuite

Files:

• arx_elem_stress.cpp (modified) (1 diff)
• arx_stress.cpp (modified) (2 diffs)
• kalman_QR_stress.cpp (modified) (1 diff)
• kalman_stress.cpp (modified) (6 diffs)
• mixtures_stress.cpp (modified) (1 diff)
• particle_stress.cpp (modified) (1 diff)
• resample_stress.cpp (modified) (1 diff)
• size_generator.cpp (modified) (1 diff)
• stresssuite.cpp (modified) (1 diff)

library/tests/stresssuite/arx_elem_stress.cpp

@@ -11 +11 @@
         ARX Ar;
         Ar.set_statistics ( 1, V0, -1.0 );
-        Ar.set_constant(true);
+        Ar.set_constant ( true );
         Ar.validate();
 

library/tests/stresssuite/arx_stress.cpp

@@ -29 +29 @@
         ARX Ar;
         Ar.set_statistics ( 1, V0, nu0 );               // Estimator
-        Ar.set_constant(false);
+        Ar.set_constant ( false );
         Ar.validate();
         const epdf& f_thr = Ar.posterior();          // refrence to posterior of the estimator
@@ -52 +52 @@
                 Yt ( t ) = th * rgr + sqr * NorRNG();
 
-                Ar.bayes ( vec_1(Yt(t)), rgr );             // Bayes rule
+                Ar.bayes ( vec_1 ( Yt ( t ) ), rgr );       // Bayes rule
 
                 // Build predictor

library/tests/stresssuite/kalman_QR_stress.cpp

@@ -70 +70 @@
         KF_QR.set_parameters ( &evolQR, &evolQR, 100 );
         evolQR.condition ( "1 1 1" );
-        egamma kfinit=egamma("10 10 10","1 1 1");
-        KF_QR.set_statistics ( egamma("10 10 10","1 1 1"), &KF );
+        egamma kfinit = egamma ( "10 10 10", "1 1 1" );
+        KF_QR.set_statistics ( egamma ( "10 10 10", "1 1 1" ), &KF );
         const epdf& mpost = KF_QR.posterior();
         const epdf& mposttr = KFtr.posterior();

library/tests/stresssuite/kalman_stress.cpp

@@ -63 +63 @@
         KF.set_parameters ( A, B, C, D, chmat ( Q ), chmat ( R ) );
         KF.set_statistics ( mu0, chmat ( P0 ) ); //prediction!
-        KF.set_evalll(false);
+        KF.set_evalll ( false );
         KF.validate();
         const epdf& KFep = KF.posterior();
@@ -71 +71 @@
         // FULL
         KalmanFull KF2;
-        KF2.set_parameters( A, B, C, D,  Q, R);
-        KF2.set_statistics(  mu0, P0 );
-        KF2.set_evalll(false);
+        KF2.set_parameters ( A, B, C, D,  Q, R );
+        KF2.set_statistics ( mu0, P0 );
+        KF2.set_evalll ( false );
         KF2.validate();
         mat Xt2 ( dimx, Ndat );
@@ -85 +85 @@
         KFE.set_parameters ( fxu, hxu, Q, R );
         KFE.set_statistics ( mu0, chmat ( P0 ) );
-        KFE.set_evalll(false);
+        KFE.set_evalll ( false );
         KFE.validate();
         const epdf& KFEep = KFE.posterior();
@@ -98 +98 @@
         tt.tic();
         for ( int t = 1; t < Ndat; t++ ) {
-                dt = Dt.get_col(t);
-                KF.bayes ( dt.get(0,C.rows()-1), dt.get(C.rows(), dt.length()-1) );
+                dt = Dt.get_col ( t );
+                KF.bayes ( dt.get ( 0, C.rows() - 1 ), dt.get ( C.rows(), dt.length() - 1 ) );
                 Xt.set_col ( t, KFep.mean() );
         }
@@ -106 +106 @@
         tt.tic();
         for ( int t = 1; t < Ndat; t++ ) {
-                dt = Dt.get_col(t);
-                KF2.bayes ( dt.get(0,C.rows()-1), dt.get(C.rows(), dt.length()-1) );
+                dt = Dt.get_col ( t );
+                KF2.bayes ( dt.get ( 0, C.rows() - 1 ), dt.get ( C.rows(), dt.length() - 1 ) );
                 Xt2.set_col ( t, KF2.posterior().mean() );
         }
@@ -114 +114 @@
         tt.tic();
         for ( int t = 1; t < Ndat; t++ ) {
-                dt = Dt.get_col(t);
-                KFE.bayes ( dt.get(0,C.rows()-1), dt.get(C.rows(), dt.length()-1) );
+                dt = Dt.get_col ( t );
+                KFE.bayes ( dt.get ( 0, C.rows() - 1 ), dt.get ( C.rows(), dt.length() - 1 ) );
                 XtE.set_col ( t, KFEep.mean() );
         }

library/tests/stresssuite/mixtures_stress.cpp

@@ -101 +101 @@
         // Add ones for constant coefficients
         mat Data = concat_vertical ( Smp, ones ( 1, Smp.cols() ) );
-        Post.bayes ( Data , empty_vec);
+        Post.bayes ( Data , empty_vec );
 
         cout << "Posterior mixture:" << endl;

library/tests/stresssuite/particle_stress.cpp

@@ -37 +37 @@
 
         ivec ind;
-        emp.resample(ind);
+        emp.resample ( ind );
 
         cout << ind << endl;

library/tests/stresssuite/resample_stress.cpp

@@ -38 +38 @@
 
         ivec ind;
-        emp.resample(ind);
+        emp.resample ( ind );
 
         cout << ind << endl;

library/tests/stresssuite/size_generator.cpp

@@ -5 +5 @@
 using bdm::UI;
 
-void size_generator::from_setting(const Setting &set) {
-        UI::get( sz, set, "size", UI::optional );
-        UI::get( step, set, "step", UI::optional );
+void size_generator::from_setting ( const Setting &set ) {
+        UI::get ( sz, set, "size", UI::optional );
+        UI::get ( step, set, "step", UI::optional );
 }
 

library/tests/stresssuite/stresssuite.cpp

@@ -5 +5 @@
 #include "itpp_ext.h"
 #include <string.h>
+#include "../general_suite.h"
 
-using std::cout;
-using std::cerr;
-using std::endl;
-
-using namespace itpp;
-
-Array<const char *> selected_tests;
-
-bool is_selected_test ( const UnitTest::Test *test ) {
-        bdm_assert_debug ( test, "NULL test" );
-
-        if ( !selected_tests.length() ) {
-                return true;
-        }
-
-        for ( int i = 0; i < selected_tests.length(); ++i ) {
-                const char *n = test->m_details.testName;
-                bdm_assert_debug ( n, "NULL test name" );
-                const char *sname = selected_tests ( i );
-                bdm_assert_debug ( sname, "NULL selected test name" );
-                if ( !strcmp ( n, sname ) ) {
-                        return true;
-                }
-        }
-
-        return false;
-}
+using namespace UnitTest;
 
 int main ( int argc, char const *argv[] ) {
         if ( argc > 1 ) {
-                if ( !strcmp ( argv[1], "print" ) ) {
-                        UnitTest::Test* curTest = UnitTest::Test::GetTestList().GetHead();
-
-                        while ( curTest != 0 ) {
-                                const char *n = curTest->m_details.testName;
-                                printf ( "%s\n", n );
-                                curTest = curTest->next;
-                        }
-                        return 0;
-                } else {
-                        selected_tests.set_length ( argc - 1 );
-                        const char **param = argv + 1;
-                        int i = 0;
-                        while ( *param ) {
-                                selected_tests ( i ) = *param;
-                                ++i;
-                                ++param;
-                        }
-                }
+                if ( !strcmp ( argv[1], "print" ) )
+                        print_test_list();
+                else
+                        pick_selected_tests ( argc, argv );
         } else {
-                cout << endl << "STRESSSUITE - a program covering all BDM stress tests." << endl << endl 
-                     << argv[0] << " ....................................... run all stress tests" << endl 
-                     << argv[0] << " particular_test_1 particular_test_2 ... run selected stress tests" << endl 
+                cout << endl << "STRESSSUITE - a program covering all BDM stress tests." << endl << endl
+                     << argv[0] << " ....................................... run all stress tests" << endl
+                     << argv[0] << " particular_test_1 particular_test_2 ... run selected stress tests" << endl
                      << argv[0] << " print ................................. print all the implemented stress tests" << endl;
         }
 
-        itpp::RNG_randomize();
-
-        UnitTest::TestReporterStdout reporter;
-        UnitTest::TestRunner runner ( reporter );
-        return runner.RunTestsIf ( UnitTest::Test::GetTestList(),
-                                   0,
-                                   is_selected_test,
-                                   0 );
+        return run_selected_tests();
 }