時間測定の内容変更

Author: kyaco

modules/ximgproc/test/test_sparse_table_morphology.cpp

@@ -333,12 +333,13 @@ TEST(ximgproc_StMorph_eval, pdi)
 {
     Mat img = im(CV_8UC3);
     Mat dst;
-    int sizes[]{ 3, 5, 7, 9, 11, 21, 31, 41, 51, 101, 151, 201, 251, 301, 351, 401, 451, 501 };
+    int sizes[]{ 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 35, 41, 45, 51, 55, 61, 71,
+                81, 91, 101, 121, 151, 171, 201, 221, 251, 301, 351, 401, 451, 501 };
 
     std::ofstream ss("opencvlog_pdi.txt", std::ios_base::out);
 
     for (int c = 0; c < 3; c++)
-    for (int i = 1; i < 202; i += 2)
+    for (int i: sizes)
     {
         ss << i;
         Size sz(i, i);
@@ -348,25 +349,33 @@ TEST(ximgproc_StMorph_eval, pdi)
 
         // cv-rect
         kn = getStructuringElement(MORPH_RECT, sz);
-        if (i <= 1001)
+        if (i <= 401)
         {
             meter.start();
             cv::erode(img, dst, kn);
             meter.stop();
+            ss << "\t" << meter.getTimeMilli();
+            meter.reset();
+        }
+        else
+        {
+            ss << "\t";
         }
-        ss << "\t" << meter.getTimeMilli();
-        meter.reset();
 
         // cv-cross
         kn = getStructuringElement(MORPH_CROSS, sz);
-        if (i <= 1001)
+        if (i <= 401)
         {
             meter.start();
             cv::erode(img, dst, kn);
             meter.stop();
+            ss << "\t" << meter.getTimeMilli();
+            meter.reset();
+        }
+        else
+        {
+            ss << "\t";
         }
-        ss << "\t" << meter.getTimeMilli();
-        meter.reset();
 
         // cv-ellipse
         kn = getStructuringElement(MORPH_ELLIPSE, sz);
@@ -417,12 +426,13 @@ TEST(ximgproc_StMorph_eval, integrated)
 {
     Mat img = im(CV_8UC3);
     Mat dst;
-    int sizes[]{ 3, 5, 7, 9, 11, 21, 31, 41, 51, 101, 151, 201, 251, 301, 351, 401, 451, 501 };
+    int sizes[]{ 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 35, 41, 45, 51, 55, 61, 71,
+                81, 91, 101, 121, 151, 171, 201, 221, 251, 301, 351, 401, 451, 501 };
 
     std::ofstream ss("opencvlog_integrated.txt", std::ios_base::out);
 
     for (int c = 0; c < 3; c++)
-    for (int i = 1; i < 202; i += 2)
+    for (int i: sizes)
     {
         ss << i;
         Size sz(i, i);
@@ -431,25 +441,33 @@ TEST(ximgproc_StMorph_eval, integrated)
 
         // cv-rect
         kn = getStructuringElement(MORPH_RECT, sz);
-        if (i <= 1001)
+        if (i <= 401)
         {
             meter.start();
             cv::erode(img, dst, kn);
             meter.stop();
+            ss << "\t" << meter.getTimeMilli();
+            meter.reset();
+        }
+        else
+        {
+            ss << "\t";
         }
-        ss << "\t" << meter.getTimeMilli();
-        meter.reset();
 
         // cv-cross
         kn = getStructuringElement(MORPH_CROSS, sz);
-        if (i <= 1001)
+        if (i <= 401)
         {
             meter.start();
             cv::erode(img, dst, kn);
             meter.stop();
+            ss << "\t" << meter.getTimeMilli();
+            meter.reset();
+        }
+        else
+        {
+            ss << "\t";
         }
-        ss << "\t" << meter.getTimeMilli();
-        meter.reset();
 
         // cv-ellipse
         kn = getStructuringElement(MORPH_ELLIPSE, sz);