added test_case_count_scale parameter

git-svn-id: https://code.ros.org/svn/opencv/trunk@677 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/tests/cxts/cxts.cpp b/opencv/tests/cxts/cxts.cpp
index 969700e6f180d054730263d7ee535f51798b67af..804aa513f93a981aa7685dc3264e76054af3dae8 100644 (file)
--- a/opencv/tests/cxts/cxts.cpp
+++ b/opencv/tests/cxts/cxts.cpp
@@ -1436,6 +1436,9 @@ int CvTS::read_params( CvFileStorage* fs )
                                                      "functions" : "tests", "" );
     params.resource_path = cvReadStringByName( fs, node, "." );
     params.use_optimized = cvReadIntByName( fs, node, "use_optimized", -1 );
+    params.test_case_count_scale = cvReadRealByName( fs, node, "test_case_count_scale", 1. );
+    if( params.test_case_count_scale <= 0 )
+        params.test_case_count_scale = 1.;
     str = cvReadStringByName( fs, node, "seed", 0 );
     params.rng_seed = 0;
     if( str && strlen(str) == 16 )

diff --git a/opencv/tests/cxts/cxts.h b/opencv/tests/cxts/cxts.h
index 60bd363f9da3ae5fe5f42587840c8e81372af68a..2f1b0e9fcd8b6d0e82d07311c32c07fd0a2c18df 100644 (file)
--- a/opencv/tests/cxts/cxts.h
+++ b/opencv/tests/cxts/cxts.h
@@ -387,6 +387,9 @@ public:
     // returns the current timing mode
     int get_timing_mode() { return params.timing_mode; }
 
+    // returns the test extensivity scale
+    double get_test_case_count_scale() { return params.test_case_count_scale; }
+
     int find_written_param( CvTest* test, const char* paramname,
                             int valtype, const void* val );
 
@@ -489,6 +492,9 @@ protected:
 
         // whether to use IPP, MKL etc. or not
         int use_optimized;
+
+        // extensivity of the tests, scale factor for test_case_count
+        double test_case_count_scale;
     }
     params;
 

diff --git a/opencv/tests/cxts/cxts_arrtest.cpp b/opencv/tests/cxts/cxts_arrtest.cpp
index d9b981ca921e4c8751335dc946952442a68ebed2..a2eef2d76fec3fbf24eff7e46f1619df9ecdbedf 100644 (file)
--- a/opencv/tests/cxts/cxts_arrtest.cpp
+++ b/opencv/tests/cxts/cxts_arrtest.cpp
@@ -165,6 +165,7 @@ int CvArrTest::read_params( CvFileStorage* fs )
         min_log_array_size = cvReadInt( find_param( fs, "min_log_array_size" ), min_log_array_size );
         max_log_array_size = cvReadInt( find_param( fs, "max_log_array_size" ), max_log_array_size );
         test_case_count = cvReadInt( find_param( fs, "test_case_count" ), test_case_count );
+        test_case_count = cvRound( test_case_count*ts->get_test_case_count_scale() );
 
         min_log_array_size = cvTsClipInt( min_log_array_size, 0, 20 );
         max_log_array_size = cvTsClipInt( max_log_array_size, min_log_array_size, 20 );