Changeset 737 for library/tests

Timestamp:

11/25/09 12:14:38 (14 years ago)

Author:

mido

Message:

ASTYLER RUN OVER THE WHOLE LIBRARY, JUPEE

Location:

library/tests

Files:

• epdf_harness.cpp (modified) (3 diffs)
• testsuite/LQG_test.cpp (modified) (1 diff)
• testsuite/datalink_test.cpp (modified) (1 diff)
• testsuite/logger_test.cpp (modified) (3 diffs)
• unittest-cpp/TestRunner.cpp (modified) (1 diff)
• unittest-cpp/TestRunner.h (modified) (2 diffs)

library/tests/epdf_harness.cpp

@@ -45 +45 @@
         if ( support ) { // support is given
                 grid_fnc ep_disc;
-                ep_disc.set_support(*support);
-                ep_disc.set_values(*hepdf);
+                ep_disc.set_support ( *support );
+                ep_disc.set_values ( *hepdf );
                 // ep_disc is discretized at support points
 
-                double point_volume =prod(support->_steps());
-                CHECK_CLOSE(1.0, sum(ep_disc._values())*point_volume, 0.01);
-
-                vec pdf=ep_disc._values();
-                pdf /=sum(pdf); // normalize
-                
-                vec mea=pdf(0) * support->first_vec();
-                mat Remp=pdf(0) * outer_product(support->act_vec(), support->act_vec());
+                double point_volume = prod ( support->_steps() );
+                CHECK_CLOSE ( 1.0, sum ( ep_disc._values() ) *point_volume, 0.01 );
+
+                vec pdf = ep_disc._values();
+                pdf /= sum ( pdf ); // normalize
+
+                vec mea = pdf ( 0 ) * support->first_vec();
+                mat Remp = pdf ( 0 ) * outer_product ( support->act_vec(), support->act_vec() );
 
                 // run through all points
-                for (int i=1; i<support->points(); i++){
-                        mea += pdf(i)*support->next_vec();
-                        Remp += pdf(i) * outer_product(support->act_vec(), support->act_vec());
-                }
-                CHECK_CLOSE(mean, mea, tolerance);
-                CHECK_CLOSE(R, Remp-outer_product(mea,mea), tolerance);
+                for ( int i = 1; i < support->points(); i++ ) {
+                        mea += pdf ( i ) * support->next_vec();
+                        Remp += pdf ( i ) * outer_product ( support->act_vec(), support->act_vec() );
+                }
+                CHECK_CLOSE ( mean, mea, tolerance );
+                CHECK_CLOSE ( R, Remp - outer_product ( mea, mea ), tolerance );
         }
 
@@ -70 +70 @@
                 check_sample_mean();
         }
-        if (R.rows()>0){
+        if ( R.rows() > 0 ) {
                 check_covariance();
         }
@@ -133 +133 @@
         } while ( ( tc < CurrentContext::max_trial_count ) &&
                   !UnitTest::AreClose ( mean, actual ( tc - 1 ), delta ) );
-                          
+
         if ( ( tc == CurrentContext::max_trial_count ) &&
                 ( !UnitTest::AreClose ( mean, actual ( CurrentContext::max_trial_count - 1 ), delta ) ) ) {

library/tests/testsuite/LQG_test.cpp

@@ -5 +5 @@
 using namespace bdm;
 
-TEST(LQG_test) {
+TEST ( LQG_test ) {
         LQG reg;
-        shared_ptr<StateSpace<chmat> > stsp=new StateSpace<chmat>;
+        shared_ptr<StateSpace<chmat> > stsp = new StateSpace<chmat>;
         // 2 x 1 x 1
-        stsp-> set_parameters(eye(2), ones(2,1), ones(1,2), ones(1,1), /* Q,R */ eye(2), eye(1));
-        reg.set_system(stsp); // A, B, C
-        reg.set_control_parameters(eye(1), eye(1),  vec_1(1.0), 6); //Qy, Qu, horizon
+        stsp-> set_parameters ( eye ( 2 ), ones ( 2, 1 ), ones ( 1, 2 ), ones ( 1, 1 ), /* Q,R */ eye ( 2 ), eye ( 1 ) );
+        reg.set_system ( stsp ); // A, B, C
+        reg.set_control_parameters ( eye ( 1 ), eye ( 1 ),  vec_1 ( 1.0 ), 6 ); //Qy, Qu, horizon
         reg.validate();
 
         reg.redesign();
-        double reg_apply=reg.ctrlaction("0.5, 1.1","0.0")(0); /*convert vec to double*/
-        CHECK_CLOSE(reg_apply, -0.248528137234392, 0.0001);
+        double reg_apply = reg.ctrlaction ( "0.5, 1.1", "0.0" ) ( 0 ); /*convert vec to double*/
+        CHECK_CLOSE ( reg_apply, -0.248528137234392, 0.0001 );
 }
 
-TEST(to_state_test) {
+TEST ( to_state_test ) {
         mlnorm<fsqmat> ml;
-        mat A="1.1, 2.3";
-        ml.set_parameters(A, vec_1(1.3), eye(1));
-        RV yr=RV("y",1);
-        RV ur=RV("u",1);
-        ml.set_rv(yr);
-        yr.t_plus(-1);
-        ml.set_rvc(concat(yr, ur));
-        
-        shared_ptr<StateCanonical > Stsp=new StateCanonical;
-        Stsp->connect_mlnorm(ml);
-        
-        /* results from 
+        mat A = "1.1, 2.3";
+        ml.set_parameters ( A, vec_1 ( 1.3 ), eye ( 1 ) );
+        RV yr = RV ( "y", 1 );
+        RV ur = RV ( "u", 1 );
+        ml.set_rv ( yr );
+        yr.t_plus ( -1 );
+        ml.set_rvc ( concat ( yr, ur ) );
+
+        shared_ptr<StateCanonical > Stsp = new StateCanonical;
+        Stsp->connect_mlnorm ( ml );
+
+        /* results from
         [A,B,C,D]=tf2ss([2.3 0],[1 -1.1])
         */
-        CHECK_CLOSE_EX(Stsp->_A().get_row(0), vec("1.1"), 0.0001);
-        CHECK_CLOSE_EX(Stsp->_C().get_row(0), vec("2.53"), 0.0001);
-        CHECK_CLOSE_EX(Stsp->_D().get_row(0), vec("2.30"), 0.0001);
+        CHECK_CLOSE_EX ( Stsp->_A().get_row ( 0 ), vec ( "1.1" ), 0.0001 );
+        CHECK_CLOSE_EX ( Stsp->_C().get_row ( 0 ), vec ( "2.53" ), 0.0001 );
+        CHECK_CLOSE_EX ( Stsp->_D().get_row ( 0 ), vec ( "2.30" ), 0.0001 );
 }
 
-TEST(to_state_arx_test) {
+TEST ( to_state_arx_test ) {
         mlnorm<chmat> ml;
-        mat A="1.1, 2.3, 3.4";
-        ml.set_parameters(A, vec_1(1.3), eye(1));
-        RV yr=RV("y",1);
-        RV ur=RV("u",1);
-        ml.set_rv(yr);
-        ml.set_rvc(concat(yr.copy_t(-1), concat(ur, ur.copy_t(-1))));
-        
-        shared_ptr<StateFromARX> Stsp=new StateFromARX;
-        RV xrv; RV urv;
-        Stsp->connect_mlnorm(ml,xrv,urv);
-        
-        /* results from 
+        mat A = "1.1, 2.3, 3.4";
+        ml.set_parameters ( A, vec_1 ( 1.3 ), eye ( 1 ) );
+        RV yr = RV ( "y", 1 );
+        RV ur = RV ( "u", 1 );
+        ml.set_rv ( yr );
+        ml.set_rvc ( concat ( yr.copy_t ( -1 ), concat ( ur, ur.copy_t ( -1 ) ) ) );
+
+        shared_ptr<StateFromARX> Stsp = new StateFromARX;
+        RV xrv;
+        RV urv;
+        Stsp->connect_mlnorm ( ml, xrv, urv );
+
+        /* results from
         [A,B,C,D]=tf2ss([2.3 0],[1 -1.1])
         */
-        CHECK_CLOSE_EX(Stsp->_A().get_row(0), vec("1.1, 3.4, 1.3"), 0.0001);
-        CHECK_CLOSE_EX(Stsp->_B().get_row(0), vec("2.3"), 0.0001);
-        CHECK_CLOSE_EX(Stsp->_C().get_row(0), vec("1, 0, 0"), 0.0001);
+        CHECK_CLOSE_EX ( Stsp->_A().get_row ( 0 ), vec ( "1.1, 3.4, 1.3" ), 0.0001 );
+        CHECK_CLOSE_EX ( Stsp->_B().get_row ( 0 ), vec ( "2.3" ), 0.0001 );
+        CHECK_CLOSE_EX ( Stsp->_C().get_row ( 0 ), vec ( "1, 0, 0" ), 0.0001 );
 }
 
-TEST(arx_LQG_test){
+TEST ( arx_LQG_test ) {
         mlnorm<chmat> ml;
-        mat A="1.81, -.81, .00468, .00438";
-        ml.set_parameters(A, vec_1(0.0), 0.00001*eye(1));
-        RV yr=RV("y",1);
-        RV ur=RV("u",1);
-        RV rgr = yr.copy_t(-1);
-        rgr.add(yr.copy_t(-2));
-        rgr.add(yr.copy_t(-2));
-        rgr.add(ur.copy_t(-1));
-        rgr.add(ur);
-        
-        ml.set_rv(yr);
-        ml.set_rvc(rgr);
+        mat A = "1.81, -.81, .00468, .00438";
+        ml.set_parameters ( A, vec_1 ( 0.0 ), 0.00001*eye ( 1 ) );
+        RV yr = RV ( "y", 1 );
+        RV ur = RV ( "u", 1 );
+        RV rgr = yr.copy_t ( -1 );
+        rgr.add ( yr.copy_t ( -2 ) );
+        rgr.add ( yr.copy_t ( -2 ) );
+        rgr.add ( ur.copy_t ( -1 ) );
+        rgr.add ( ur );
+
+        ml.set_rv ( yr );
+        ml.set_rvc ( rgr );
         ml.validate();
-        
-        shared_ptr<StateFromARX> Stsp=new StateFromARX;
-        RV xrv; RV urv;
-        Stsp->connect_mlnorm(ml,xrv,urv);
-        
+
+        shared_ptr<StateFromARX> Stsp = new StateFromARX;
+        RV xrv;
+        RV urv;
+        Stsp->connect_mlnorm ( ml, xrv, urv );
+
         LQG L;
-        L.set_system(Stsp);
-        L.set_control_parameters(eye(1), sqrt(1.0/1000)*eye(1), vec_1(0.0), 100);
+        L.set_system ( Stsp );
+        L.set_control_parameters ( eye ( 1 ), sqrt ( 1.0 / 1000 ) *eye ( 1 ), vec_1 ( 0.0 ), 100 );
         L.validate();
-        
+
         L.redesign();
-        cout << L.to_string()<<endl;
+        cout << L.to_string() << endl;
 }

library/tests/testsuite/datalink_test.cpp

@@ -101 +101 @@
 
         vec val_up ( "1 2" );
-        dl.store_data(val_up);
+        dl.store_data ( val_up );
         val_up = "3 4";
 

library/tests/testsuite/logger_test.cpp

@@ -42 +42 @@
 
         int pol = 11;
-        
+
         int rid = logger.add_vector ( r, "" );
         int thid = logger.add_vector ( th, "th" );
-        int polid = logger.add_setting("pols");
+        int polid = logger.add_setting ( "pols" );
 
         logger.init();
@@ -52 +52 @@
                 logger.log_vector ( rid, vec_2 ( ( double ) i, ( double ) ( i + 1 ) ) );
                 logger.log_vector ( thid, vec_2 ( ( double ) ( 100 - i ), ( double ) ( i - 50 ) ) );
-                UI::save(pol, logger.log_to_setting(polid), "polozka");
+                UI::save ( pol, logger.log_to_setting ( polid ), "polozka" );
                 logger.step();
         }
@@ -58 +58 @@
         logger.finalize();
 
-        CHECK_EQUAL ( get_file_size ( "logger_test.matrix" ), get_file_size ( (ls+".it").c_str() ) );
-        CHECK_EQUAL ( get_file_size ( (ls+".cfg.check").c_str() ), get_file_size ( (ls+".cfg" ).c_str() ));
+        CHECK_EQUAL ( get_file_size ( "logger_test.matrix" ), get_file_size ( ( ls + ".it" ).c_str() ) );
+        CHECK_EQUAL ( get_file_size ( ( ls + ".cfg.check" ).c_str() ), get_file_size ( ( ls + ".cfg" ).c_str() ) );
 }
 

library/tests/unittest-cpp/TestRunner.cpp

@@ -71 +71 @@
 
 void TestRunner::ClearEnvironment() const {
-        bdm::RV::clear_all();   
+        bdm::RV::clear_all();
 }
 

library/tests/unittest-cpp/TestRunner.h

@@ -31 +31 @@
 
                 while ( curTest != 0 ) {
-                        if ( IsTestInSuite ( curTest, suiteName ) && predicate ( curTest ) )
-                        {
+                        if ( IsTestInSuite ( curTest, suiteName ) && predicate ( curTest ) ) {
                                 ClearEnvironment();
                                 RunTest ( m_result, curTest, maxTestTimeInMs );
@@ -51 +50 @@
         int Finish() const;
         bool IsTestInSuite ( const Test* const curTest, char const* suiteName ) const;
-        void RunTest ( TestResults* const result, Test* const curTest, int const maxTestTimeInMs ) const;       
+        void RunTest ( TestResults* const result, Test* const curTest, int const maxTestTimeInMs ) const;
         void ClearEnvironment() const;
 };