Changeset 727 for library/tests

Timestamp:

11/17/09 00:54:12 (15 years ago)

Author:

smidl

Message:

Logger change. Loggers can now store settings.

Unit Tests and fixes.

Location:

library/tests

Files:

• mat_checks.h (modified) (1 diff)
• testsuite/epdf_test.cpp (modified) (1 diff)
• testsuite/logger_test.cpp (modified) (3 diffs)
• testsuite/logger_test_dirfile_format.matrix (modified) (1 diff)
• testsuite/memlog_setting.cfg.check (added)

library/tests/mat_checks.h

@@ -57 +57 @@
 inline itpp::vec make_close_tolerance ( const itpp::vec & variance, int nsamples ) {
         // simplify overloading for Visual Studio
-        return 2 * ( sqrt ( variance ) / sqrt ( static_cast<double> ( nsamples ) ) );
+        return 3 * ( sqrt ( variance ) / sqrt ( static_cast<double> ( nsamples ) ) );
 }
 

library/tests/testsuite/epdf_test.cpp

@@ -43 +43 @@
 
 TEST ( ewishart_test ) {
-        mat wM = "10.0 0.9; 0.9 1.0";
+        mat wM = "1.1 0.9; 0.9 1.0";
         eWishartCh eW;
         eW.set_parameters ( wM / 100, 100 );

library/tests/testsuite/logger_test.cpp

@@ -41 +41 @@
         memlog logger ( 100, ls );
 
-        int rid = logger.add ( r, "" );
-        int thid = logger.add ( th, "th" );
+        int pol = 11;
+        
+        int rid = logger.add_vector ( r, "" );
+        int thid = logger.add_vector ( th, "th" );
+        int polid = logger.add_setting("pols");
 
         logger.init();
 
         for ( int i = 0; i < 10; i++ ) {
-                logger.logit ( rid, vec_2 ( ( double ) i, ( double ) ( i + 1 ) ) );
-                logger.logit ( thid, vec_2 ( ( double ) ( 100 - i ), ( double ) ( i - 50 ) ) );
+                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");
                 logger.step();
         }
@@ -55 +59 @@
 
         CHECK_EQUAL ( get_file_size ( "logger_test.matrix" ), get_file_size ( ls.c_str() ) );
+        CHECK_EQUAL ( get_file_size ( "memlog_setting.cfg.check" ), get_file_size ( "memlog_setting.cfg" ) );
 }
 
@@ -68 +73 @@
         dirfilelog L ( "dirfilelog_files", 10 );
 
-        int rid = L.add ( r, "" );
-        int thid = L.add ( th, "th" );
+        int rid = L.add_vector ( r, "" );
+        int thid = L.add_vector ( th, "th" );
 
         L.init();
 
         for ( int i = 0; i < 150; i++ ) {
-                L.logit ( rid, vec_2 ( ( double ) i, ( double ) ( i + 1 ) ) );
-                L.logit ( thid, vec_2 ( ( double ) ( 100 - i ), ( double ) ( i - 50 ) ) );
+                L.log_vector ( rid, vec_2 ( ( double ) i, ( double ) ( i + 1 ) ) );
+                L.log_vector ( thid, vec_2 ( ( double ) ( 100 - i ), ( double ) ( i - 50 ) ) );
                 L.step();
         }

library/tests/testsuite/logger_test_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