Changeset 480

Timestamp:

08/06/09 07:49:38 (15 years ago)

Author:

vbarta

Message:

fixed tests for new UI::get & UI::build

Location:

library/tests

Files:

• additive_generator.cpp (modified) (2 diffs)
• epdf_harness.cpp (modified) (2 diffs)
• mpdf_harness.cpp (modified) (3 diffs)
• size_generator.cpp (modified) (1 diff)
• square_mat_point.cpp (modified) (1 diff)
• square_mat_prep.cpp (modified) (1 diff)
• square_mat_stress.cpp (modified) (1 diff)
• test_user_info.cpp (modified) (3 diffs)
• test_user_info_input.cfg (modified) (1 diff)

library/tests/additive_generator.cpp

@@ -7 +7 @@
 void additive_generator::from_setting ( const Setting &set ) {
         int sz;
-        UI::get ( sz, set, "size" );
+        UI::get ( sz, set, "size", UI::compulsory );
 
         mat a0 = randu ( sz, sz );
@@ -14 +14 @@
         v2 = outer_product ( v, v );
 
-        if ( set.exists ( "lambda" ) ) {
-                UI::get ( lambda, set, "lambda" );
-        }
+        UI::get ( lambda, set, "lambda", UI::optional );
 }
 

library/tests/epdf_harness.cpp

@@ -20 +20 @@
         UIFile in ( config_file_name );
         Array<epdf_harness *> input;
-        UI::get ( input, in, "data" );
+        UI::get ( input, in, "data", UI::compulsory );
         int sz = input.size();
         CHECK ( sz > 0 );
@@ -33 +33 @@
         UI::get ( variance, set, "variance", UI::compulsory );
 
+        UI::get (support, set, "support", UI::optional );
+        UI::get (nbins, set, "nbins", UI::optional );
+        UI::get (nsamples, set, "nsamples", UI::optional );
+        UI::get (R, set, "R", UI::optional );
 
-        UI::get ( support, set, "support" );
-        UI::get ( nbins, set, "nbins" );
-        UI::get ( nsamples, set, "nsamples" );
-        UI::get ( R, set, "R" );
+        mrv = UI::build<RV> (set, "marginal_rv", UI::optional );
 
-        RV* rv = UI::build<RV> ( set, "marginal_rv" );
-        if ( rv )
-                mrv = shared_ptr<RV> ( rv );
-
-        UI::get ( tolerance, set, "tolerance" );
+        UI::get ( tolerance, set, "tolerance", UI::optional );
 }
 

library/tests/mpdf_harness.cpp

@@ -18 +18 @@
         UIFile in ( config_file_name );
         Array<mpdf_harness *> input;
-        UI::get ( input, in, "data" );
+        UI::get ( input, in, "data", UI::compulsory );
         int sz = input.size();
         CHECK ( sz > 0 );
@@ -31 +31 @@
         UI::get ( mean, set, "mean", UI::compulsory );
 
-
-        UI::get ( nsamples, set, "nsamples" );
-        UI::get ( R, set, "R" );
-        UI::get ( tolerance, set, "tolerance" );
+        UI::get ( nsamples, set, "nsamples", UI::optional );
+        UI::get ( R, set, "R", UI::optional );
+        UI::get ( tolerance, set, "tolerance", UI::optional );
 }
 
@@ -45 +44 @@
         mat er = ( smp * smp.T() ) / n - outer_product ( emu, emu );
         CHECK_CLOSE_EX ( mean, emu, tolerance );
-        CHECK_CLOSE_EX ( R, er, tolerance );
+
+        if ( R.rows() > 0 ) {
+                CHECK_CLOSE_EX ( R, er, tolerance );
+        }
 }
 

library/tests/size_generator.cpp

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

library/tests/square_mat_point.cpp

@@ -5 +5 @@
 
 void square_mat_point::from_setting ( const Setting &set ) {
-        UI::get ( matrix, set, "matrix" );
-        UI::get ( vector, set, "vector" );
-        UI::get ( scalar, set, "scalar" );
+        UI::get ( matrix, set, "matrix", UI::compulsory );
+        UI::get ( vector, set, "vector", UI::compulsory );
+        UI::get ( scalar, set, "scalar", UI::compulsory );
 }
 

library/tests/square_mat_prep.cpp

@@ -65 +65 @@
 
                 UIFile gspec ( generator_file_name );
-                auto_ptr<generator> gen ( UI::build<generator> ( gspec, "generator" ) );
+                auto_ptr<generator> gen ( UI::build<generator> ( gspec, "generator", UI::compulsory ) );
                 for ( int i = 0; i < agenda_length; ++i ) {
                         mat m = gen->next();

library/tests/square_mat_stress.cpp

@@ -176 +176 @@
         UIFile fag ( agenda_file_name );
         Array<square_mat_point *> mag;
-        UI::get ( mag, fag, "agenda" );
+        UI::get ( mag, fag, "agenda", UI::compulsory );
         int sz = mag.size();
         CHECK ( sz > 0 );

library/tests/test_user_info.cpp

@@ -163 +163 @@
                 Transport::from_setting ( set );
 
-                UI::get ( electricLights, set, "electricLights" );
+                int elights;
+                if ( UI::get ( elights, set, "electricLights", UI::optional ) ) {
+                    electricLights = !!elights;
+                }
 
                 UI::get ( matr, set, "matr" );
@@ -189 +192 @@
 TEST ( test_load ) {
         UIFile in ( "test_user_info_input.cfg" );
-        auto_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo" ) );
+        auto_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo", UI::compulsory ) );
         CHECK_EQUAL ( string ( "A car made in 1998 by audi, having 25000 kilometers on the clock.The names of passengers are as follows: Karlos Novak -1_CygWin_Matlab_Aimsun Karlosik Novacek " ), pepikovo->to_string() );
 
-        auto_ptr<Transport> jardovo ( UI::build<Transport> ( in, "jardovo" ) );
+        auto_ptr<Transport> jardovo ( UI::build<Transport> ( in, "jardovo", UI::compulsory ) );
         CHECK_EQUAL ( string ( "A car made in 1992 by liaz, having 1555000 kilometers on the clock." ), jardovo->to_string() );
 
-        auto_ptr<Transport> ondrejovo ( UI::build<Transport> ( in, "ondrejovo" ) );
+        auto_ptr<Transport> ondrejovo ( UI::build<Transport> ( in, "ondrejovo", UI::compulsory ) );
         CHECK_EQUAL ( string ( "a bike made in 1996 by author with electric lights included" ), ondrejovo->to_string() );
 
-        auto_ptr<Transport> elisky ( UI::build<Transport> ( in, "elisky" ) );
+        auto_ptr<Transport> elisky ( UI::build<Transport> ( in, "elisky", UI::compulsory ) );
         CHECK_EQUAL ( string ( "A car made in 1992 by liaz, having 1555000 kilometers on the clock." ), elisky->to_string() );
 
-        auto_ptr<Transport> kati ( UI::build<Transport> ( in, "kati" ) );
+        auto_ptr<Transport> kati ( UI::build<Transport> ( in, "kati", UI::compulsory ) );
         CHECK_EQUAL ( string ( "A car made in 1980 by vecernicek, having 250000 kilometers on the clock." ), kati->to_string() );
 }
@@ -207 +210 @@
 TEST ( test_save ) {
         UIFile in ( "test_user_info_input.cfg" );
-        auto_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo" ) );
+        auto_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo", UI::compulsory ) );
 
         Car audi ( 1968, "zyl", 200 );

library/tests/test_user_info_input.cfg

@@ -25 +25 @@
   year = 1996;
   manufacturer = "author";
-  electricLights = true;
+  electricLights = 1;
   matr = ( 2, 2, [ 1.0, 0.0, 0.0, 1.0 ] );
 };