Completed countNonZero test (found that it's already exist, so new implementation...
authorAlexander Reshetnikov <no@email>
Thu, 19 Jan 2012 16:30:35 +0000 (16:30 +0000)
committerAlexander Reshetnikov <no@email>
Thu, 19 Jan 2012 16:30:35 +0000 (16:30 +0000)
modules/core/test/test_countnonzero.cpp
modules/imgproc/test/test_boundingrect.cpp

index 2ab12e3..4d76fd6 100644 (file)
@@ -4,14 +4,17 @@
 using namespace cv;\r
 using namespace std;\r
 \r
+#define CORE_COUNTNONZERO_ERROR_COUNT 1\r
+\r
+#define MESSAGE_ERROR_COUNT "Count non zero elements returned by OpenCV function is incorrect."\r
+\r
 #define sign(a) a > 0 ? 1 : a == 0 ? 0 : -1\r
 \r
 const int FLOAT_TYPE [2] = {CV_32F, CV_64F};\r
 const int INT_TYPE [5] = {CV_8U, CV_8S, CV_16U, CV_16S, CV_32S};\r
 \r
-#define MAX_CHANNELS 4\r
-#define MAX_WIDTH 1e+2\r
-#define MAX_HEIGHT 1e+2\r
+#define MAX_WIDTH 100\r
+#define MAX_HEIGHT 100\r
 \r
 class CV_CountNonZeroTest: public cvtest::BaseTest\r
 {\r
@@ -23,360 +26,193 @@ class CV_CountNonZeroTest: public cvtest::BaseTest
        void run (int);\r
 \r
  private:\r
-        float eps_32; double eps_64; Mat src;\r
+        float eps_32; \r
+        double eps_64; \r
+        Mat src;\r
+        int current_type;\r
        \r
-        void generate_src_data(cv::Size size, int type, int channels);\r
-        void generate_src_data(cv::Size size, int type, int channels, int count_non_zero);\r
-        void generate_src_float_data(cv::Size size, int type, int channels, int distribution);\r
+        void generate_src_data(cv::Size size, int type);\r
+        void generate_src_data(cv::Size size, int type, int count_non_zero);\r
+        void generate_src_stat_data(cv::Size size, int type, int distribution);\r
+\r
+        int get_count_non_zero();\r
 \r
-        void checking_function_work();  \r
-        void checking_function_work(int count_non_zero); \r
+        void print_information(int right, int result);\r
 };\r
 \r
-CV_CountNonZeroTest::CV_CountNonZeroTest(): eps_32(1e-2), eps_64(1e-4), src(Mat()) {}\r
+CV_CountNonZeroTest::CV_CountNonZeroTest(): eps_32(1e-8), eps_64(1e-16), src(Mat()), current_type(-1) {}\r
 CV_CountNonZeroTest::~CV_CountNonZeroTest() {}\r
 \r
-void CV_CountNonZeroTest::generate_src_data(cv::Size size, int type, int channels)\r
+void CV_CountNonZeroTest::generate_src_data(cv::Size size, int type)\r
 {\r
- src.create(size, CV_MAKETYPE(type, channels));\r
+ src.create(size, CV_MAKETYPE(type, 1));\r
 \r
- for (size_t i = 0; i < size.width; ++i)\r
-       for (size_t j = 0; j < size.height; ++j)\r
+ for (size_t j = 0; j < size.width; ++j)\r
+       for (size_t i = 0; i < size.height; ++i)\r
+               switch (type)\r
                {\r
-                if (type == CV_8U) switch (channels)\r
-                {\r
-                 case 1: {src.at<uchar>(j, i) = cv::randu<uchar>(); break;}\r
-                 case 2: {src.at<Vec2b>(j, i) = Vec2b(cv::randu<uchar>(), cv::randu<uchar>()); break;}\r
-                 case 3: {src.at<Vec3b>(j, i) = Vec3b(cv::randu<uchar>(), cv::randu<uchar>(), cv::randu<uchar>()); break;}\r
-                 case 4: {src.at<Vec4b>(j, i) = Vec4b(cv::randu<uchar>(), cv::randu<uchar>(), cv::randu<uchar>(), cv::randu<uchar>()); break;}\r
-\r
-                 default: break;\r
-                }\r
-\r
-                else if (type == CV_8S) switch (channels)\r
-                {\r
-                 case 1: {src.at<char>(j,i) = cv::randu<uchar>()-128; break; }\r
-                 case 2: {src.at< Vec<char, 2> >(j, i) = Vec<char, 2>(cv::randu<uchar>()-128, cv::randu<uchar>()-128); break;}\r
-                 case 3: {src.at< Vec<char, 3> >(j, i) = Vec<char, 3>(cv::randu<uchar>()-128, cv::randu<uchar>()-128, cv::randu<uchar>()-128); break;}\r
-                 case 4: {src.at< Vec<char, 4> >(j, i) = Vec<char, 4>(cv::randu<uchar>()-128, cv::randu<uchar>()-128, cv::randu<uchar>()-128, cv::randu<uchar>()-128); break;}\r
-                 default:break;\r
-                }\r
-                       \r
-                else if (type == CV_16U) switch (channels)\r
-                {\r
-                 case 1: {src.at<ushort>(j, i) = cv::randu<ushort>(); break;}\r
-                 case 2: {src.at< Vec<ushort, 2> >(j, i) = Vec<ushort, 2>(cv::randu<ushort>(), cv::randu<ushort>()); break;}\r
-                 case 3: {src.at< Vec<ushort, 3> >(j, i) = Vec<ushort, 3>(cv::randu<ushort>(), cv::randu<ushort>(), cv::randu<ushort>()); break;}\r
-                 case 4: {src.at< Vec<ushort, 4> >(j, i) = Vec<ushort, 4>(cv::randu<ushort>(), cv::randu<ushort>(), cv::randu<ushort>(), cv::randu<ushort>()); break;}\r
-                 default: break;\r
-                }\r
-\r
-                else if (type == CV_16S) switch (channels)\r
-                {\r
-                 case 1: {src.at<short>(j, i) = cv::randu<short>(); break;}\r
-                 case 2: {src.at<Vec2s>(j, i) = Vec2s(cv::randu<short>(), cv::randu<short>()); break;}\r
-                 case 3: {src.at<Vec3s>(j, i) = Vec3s(cv::randu<short>(), cv::randu<short>(), cv::randu<short>()); break;}\r
-                 case 4: {src.at<Vec4s>(j, i) = Vec4s(cv::randu<short>(), cv::randu<short>(), cv::randu<short>(), cv::randu<short>()); break;}\r
-                 default: break;\r
-                }\r
-\r
-                else if (type == CV_32S) switch (channels)\r
-                {\r
-                 case 1: {src.at<int>(j, i) = cv::randu<int>(); break;}\r
-                 case 2: {src.at<Vec2i>(j, i) = Vec2i(cv::randu<int>(), cv::randu<int>()); break;}\r
-                 case 3: {src.at<Vec3i>(j, i) = Vec3i(cv::randu<int>(), cv::randu<int>(), cv::randu<int>()); break;}\r
-                 case 4: {src.at<Vec4i>(j, i) = Vec4i(cv::randu<int>(), cv::randu<int>(), cv::randu<int>(), cv::randu<int>()); break;}\r
-                 default: break;\r
-                }\r
-\r
-                else if (type == CV_32F) switch (channels)\r
-                {\r
-                 case 1: {src.at<float>(j, i) = cv::randu<float>(); break;}\r
-                 case 2: {src.at<Vec2f>(j, i) = Vec2i(cv::randu<float>(), cv::randu<float>()); break;}\r
-                 case 3: {src.at<Vec3f>(j, i) = Vec3i(cv::randu<float>(), cv::randu<float>(), cv::randu<float>()); break;}\r
-                 case 4: {src.at<Vec4f>(j, i) = Vec4i(cv::randu<float>(), cv::randu<float>(), cv::randu<float>(), cv::randu<float>()); break;}\r
-                 default: break;\r
-                }\r
-\r
-                else if (type == CV_64F) switch (channels)\r
-                {\r
-                 case 1: {src.at<double>(j, i) = cv::randu<double>(); break;}\r
-                 case 2: {src.at<Vec2d>(j, i) = Vec2d(cv::randu<double>(), cv::randu<double>()); break;}\r
-                 case 3: {src.at<Vec3d>(j, i) = Vec3d(cv::randu<double>(), cv::randu<double>(), cv::randu<double>()); break;}\r
-                 case 4: {src.at<Vec4d>(j, i) = Vec4d(cv::randu<double>(), cv::randu<double>(), cv::randu<double>(), cv::randu<double>()); break;}\r
-                 default: break;\r
-                }\r
+                case CV_8U: { src.at<uchar>(i, j) = cv::randu<uchar>(); break; }\r
+                case CV_8S: { src.at<char>(i, j) = cv::randu<uchar>() - 128; break; }\r
+                case CV_16U: { src.at<ushort>(i, j) = cv::randu<ushort>(); break; }\r
+                case CV_16S: { src.at<short>(i, j) = cv::randu<short>(); break; }\r
+                case CV_32S: { src.at<int>(i, j) = cv::randu<int>(); break; }\r
+                case CV_32F: { src.at<float>(i, j) = cv::randu<float>(); break; }\r
+                case CV_64F: { src.at<double>(i, j) = cv::randu<double>(); break; }\r
+                default: break;\r
                }\r
 }\r
 \r
-void CV_CountNonZeroTest::generate_src_data(cv::Size size, int type, int channels, int count_non_zero)\r
+void CV_CountNonZeroTest::generate_src_data(cv::Size size, int type, int count_non_zero)\r
 {\r
- src = Mat::zeros(size, CV_MAKETYPE(type, channels));\r
+ src = Mat::zeros(size, CV_MAKETYPE(type, 1));\r
  \r
- int n = -1;\r
+ int n = 0; RNG& rng = ts->get_rng();\r
 \r
  while (n < count_non_zero)\r
  {\r
-        RNG& rng = ts->get_rng();\r
-\r
-        size_t i = rng.next()%size.height, j = rng.next()%size.width;\r
+  size_t i = rng.next()%size.height, j = rng.next()%size.width;\r
         \r
-        switch (type)\r
-        {\r
-         case CV_8U: \r
-                {\r
-                  if (channels == 1) \r
-                  {\r
-                       uchar value = cv::randu<uchar>();\r
-                       if (value != 0) {src.at<uchar>(i, j) = value; n++;}\r
-                  }\r
-                        \r
-                  else if (channels == 2)\r
-                  {\r
-                       Vec2b value(cv::randu<uchar>(), cv::randu<uchar>());\r
-                       if (value != Vec2b(0, 0)) {src.at<Vec2b>(i, j) = value; n++;}\r
-                  }\r
-\r
-                  else if (channels == 3)\r
-                  {\r
-                       Vec3b value(cv::randu<uchar>(), cv::randu<uchar>(), cv::randu<uchar>());\r
-                       if (value != Vec3b(0, 0, 0)) {src.at<Vec3b>(i, j) = value; n++;}\r
-                  }\r
-\r
-                  else\r
-\r
-                  {\r
-                   Vec4b value(cv::randu<uchar>(), cv::randu<uchar>(), cv::randu<uchar>(), cv::randu<uchar>());\r
-                       if (value != Vec4b(0, 0, 0, 0)) {src.at<Vec4b>(i, j) = value; n++;}\r
-                  }\r
-\r
-                  break;\r
-                }\r
-\r
-         case CV_8S:\r
-                 {\r
-                  if (channels == 1) \r
-                  {\r
-                       char value = cv::randu<uchar>()-128;\r
-                       if (value != 0) {src.at<char>(i, j) = value; n++;}\r
-                  }\r
-                        \r
-                  else if (channels == 2)\r
-                  {\r
-                       Vec<char, 2> value(cv::randu<uchar>()-128, cv::randu<uchar>()-128);\r
-                       if (value != Vec<char, 2>(0, 0)) {src.at< Vec<char, 2 > >(i, j) = value; n++;}\r
-                  }\r
-\r
-                  else if (channels == 3)\r
-                  {\r
-                       Vec<char, 3> value(cv::randu<uchar>()-128, cv::randu<uchar>()-128, cv::randu<uchar>()-128);\r
-                       if (value != Vec<char, 3>(0, 0, 0)) {src.at< Vec<char, 3> >(i, j) = value; n++;}\r
-                  }\r
-\r
-                  else\r
-\r
-                  {\r
-                   Vec<char, 4> value(cv::randu<uchar>()-128, cv::randu<uchar>()-128, cv::randu<uchar>()-128, cv::randu<uchar>()-128);\r
-                       if (value != Vec<char, 4>(0, 0, 0, 0)) {src.at< Vec<char, 4> >(i, j) = value; n++;}\r
-                  }\r
-\r
-                  break;\r
-                 }\r
-\r
-         case CV_16U:\r
-                 {\r
-                  if (channels == 1) \r
-                  {\r
-                       ushort value = cv::randu<ushort>();\r
-                       n += abs(sign(value));\r
-                       src.at<ushort>(i, j) = value;\r
-                  }\r
-                        \r
-                  else if (channels == 2)\r
-                  {\r
-                       Vec<ushort, 2> value(cv::randu<ushort>(), cv::randu<ushort>());\r
-                       if (value != Vec<ushort, 2>(0, 0)) {src.at< Vec<ushort, 2> >(i, j) = value; n++;}\r
-                  }\r
-\r
-                  else if (channels == 3)\r
-                  {\r
-                   Vec<ushort, 3> value(cv::randu<ushort>(), cv::randu<ushort>(), cv::randu<ushort>());\r
-                       if (value != Vec<ushort, 3>(0, 0, 0)) {src.at< Vec<ushort, 3> >(i, j) = value; n++;}\r
-                  }\r
-\r
-                  else\r
-\r
-                  {\r
-                   Vec<ushort, 4> value(cv::randu<ushort>(), cv::randu<ushort>(), cv::randu<ushort>(), cv::randu<ushort>());\r
-                       if (value != Vec<ushort, 4>(0, 0, 0, 0)) {src.at< Vec<ushort, 4> >(i, j) = value; n++;}\r
-                  }\r
+  switch (type)\r
+  {\r
+   case CV_8U: { if (!src.at<uchar>(i, j)) {src.at<uchar>(i, j) = cv::randu<uchar>(); n += abs(sign(src.at<uchar>(i, j)));} break; }\r
+   case CV_8S: { if (!src.at<char>(i, j)) {src.at<char>(i, j) = cv::randu<uchar>() - 128; n += abs(sign(src.at<char>(i, j)));} break; }\r
+   case CV_16U: { if (!src.at<ushort>(i, j)) {src.at<ushort>(i, j) = cv::randu<ushort>(); n += abs(sign(src.at<ushort>(i, j)));} break; }\r
+   case CV_16S: { if (!src.at<short>(i, j)) {src.at<short>(i, j) = cv::randu<short>(); n += abs(sign(src.at<short>(i, j)));} break; }\r
+   case CV_32S: { if (!src.at<int>(i, j)) {src.at<int>(i, j) = cv::randu<int>(); n += abs(sign(src.at<int>(i, j)));} break; }\r
+   case CV_32F: { if (fabs(src.at<float>(i, j)) <= eps_32) {src.at<float>(i, j) = cv::randu<float>(); n += sign(fabs(src.at<float>(i, j)) > eps_32);} break; }\r
+   case CV_64F: { if (fabs(src.at<double>(i, j)) <= eps_64) {src.at<double>(i, j) = cv::randu<double>(); n += sign(fabs(src.at<double>(i, j)) > eps_64);} break; }\r
+\r
+   default: break;\r
+  }\r
+ }\r
\r
+}\r
 \r
-                  break;\r
-                 }\r
+void CV_CountNonZeroTest::generate_src_stat_data(cv::Size size, int type, int distribution)\r
+{\r
+ src.create(size, CV_MAKETYPE(type, 1));\r
 \r
-         case CV_16S:\r
-                 {\r
-                  if (channels == 1) \r
-                  {\r
-                       short value = cv::randu<short>();\r
-                       n += abs(sign(value));\r
-                       src.at<short>(i, j) = value;\r
-                  }\r
-                        \r
-                  else if (channels == 2)\r
-                  {\r
-                       Vec2s value(cv::randu<short>(), cv::randu<short>());\r
-                       if (value != Vec2s(0, 0)) {src.at<Vec2s>(i, j) = value; n++;}\r
-                  }\r
+ double mean = 0.0, sigma = 1.0;\r
+ double left = -1.0, right = 1.0;\r
 \r
-                  else if (channels == 3)\r
-                  {\r
-                       Vec3s value(cv::randu<short>(), cv::randu<short>(), cv::randu<short>());\r
-                       if (value != Vec3s(0, 0, 0)) {src.at<Vec3s>(i, j) = value; n++;}\r
-                  }\r
+ RNG& rng = ts->get_rng();\r
 \r
-                  else\r
+ if (distribution == RNG::NORMAL) \r
+        rng.fill(src, RNG::NORMAL, Scalar::all(mean), Scalar::all(sigma));\r
+ else if (distribution == RNG::UNIFORM)\r
+        rng.fill(src, RNG::UNIFORM, Scalar::all(left), Scalar::all(right));\r
+}\r
 \r
-                  {\r
-                   Vec4s value(cv::randu<short>(), cv::randu<short>(), cv::randu<short>(), cv::randu<short>());\r
-                       if (value != Vec4s(0, 0, 0, 0)) {src.at<Vec4s>(i, j) = value; n++;}\r
-                  }\r
+int CV_CountNonZeroTest::get_count_non_zero()\r
+{\r
+ int result = 0, channels = src.channels();\r
 \r
-                  break;\r
-                 }\r
+ for (size_t i = 0; i < src.rows; ++i)\r
+ for (size_t j = 0; j < src.cols; ++j)\r
 \r
-         case CV_32S:\r
-                 {\r
-                  if (channels == 1) \r
-                  {\r
-                       int value = cv::randu<int>();\r
-                       n += abs(sign(value));\r
-                       src.at<int>(i, j) = value;\r
-                  }\r
-                        \r
-                  else if (channels == 2)\r
-                  {\r
-                       Vec2i value(cv::randu<int>(), cv::randu<int>());\r
-                       if (value != Vec2i(0, 0)) {src.at<Vec2i>(i, j) = value; n++;}\r
-                  }\r
+ if (current_type == CV_8U) result += abs(sign(src.at<uchar>(i, j)));\r
\r
+ else if (current_type == CV_8S) result += abs(sign(src.at<char>(i, j))); \r
 \r
-                  else if (channels == 3)\r
-                  {\r
-                       Vec3i value(cv::randu<int>(), cv::randu<int>(), cv::randu<int>());\r
-                       if (value != Vec3i(0, 0, 0)) {src.at<Vec3i>(i, j) = value; n++;}\r
-                  }\r
+ else if (current_type == CV_16U) result += abs(sign(src.at<ushort>(i, j))); \r
 \r
-                  else\r
+ else if (current_type == CV_16S) result += abs(sign(src.at<short>(i, j)));\r
 \r
-                  {\r
-                   Vec4i value(cv::randu<int>(), cv::randu<int>(), cv::randu<int>(), cv::randu<int>());\r
-                       if (value != Vec4i(0, 0, 0, 0)) {src.at<Vec4i>(i, j) = value; n++;}\r
-                  }\r
+ else if (current_type == CV_32S) result += abs(sign(src.at<int>(i, j)));\r
 \r
-                  break;\r
-                 }\r
+ else if (current_type == CV_32F) result += sign(fabs(src.at<float>(i, j)) > eps_32);\r
 \r
+ else result += sign(fabs(src.at<double>(i, j)) > eps_64);\r
 \r
-         case CV_32F:\r
-                 {\r
-                   if (channels == 1)\r
-                       {\r
-                        float value = cv::randu<float>();\r
-                        n += sign(fabs(value) > eps_32);\r
-                        src.at<float>(i, j) = value;  \r
-                       }\r
-                       \r
-                       else \r
+ return result;\r
+}\r
 \r
-                       if (channels == 2)\r
-                       {\r
-                        Vec2f value(cv::randu<float>(), cv::randu<float>());\r
-                        n += sign(cv::norm(value) > eps_32); \r
-                        src.at<Vec2f>(i, j) = value; \r
-                       }\r
+void CV_CountNonZeroTest::print_information(int right, int result)\r
+{\r
+ cout << endl; cout << "Checking for the work of countNonZero function..." << endl; cout << endl;\r
+ cout << "Type of Mat: "; \r
+ switch (current_type)\r
+ {\r
+  case 0: {cout << "CV_8U"; break;} \r
+  case 1: {cout << "CV_8S"; break;}\r
+  case 2: {cout << "CV_16U"; break;}\r
+  case 3: {cout << "CV_16S"; break;}\r
+  case 4: {cout << "CV_32S"; break;}\r
+  case 5: {cout << "CV_32F"; break;}\r
+  case 6: {cout << "CV_64F"; break;}\r
+  default: break;\r
+ }\r
+ cout << endl;\r
+ cout << "Number of rows: " << src.rows << "   Number of cols: " << src.cols << endl;\r
+ cout << "True count non zero elements: " << right << "   Result: " << result << endl; \r
+ cout << endl;\r
+}\r
 \r
-                       else \r
+void CV_CountNonZeroTest::run(int)\r
+{\r
+ const size_t N = 1500;\r
 \r
-                       if (channels == 3)\r
-                       {\r
-                        Vec3f value(cv::randu<float>(), cv::randu<float>(), cv::randu<float>());\r
-                        n += sign(cv::norm(value) > eps_32); \r
-                        src.at<Vec3f>(i, j) = value;\r
-                       }\r
-                               \r
-                       else\r
-                               \r
+ for (int k = 1; k <= 3; ++k)\r
+ for (size_t i = 0; i < N; ++i)\r
+ {\r
+  RNG& rng = ts->get_rng();\r
+\r
+  int w = rng.next()%MAX_WIDTH + 1, h = rng.next()%MAX_HEIGHT + 1;\r
+\r
+  current_type = rng.next()%7;\r
+\r
+  switch (k)\r
+  {\r
+   case 1: { \r
+                generate_src_data(Size(w, h), current_type);\r
+                        int right = get_count_non_zero(), result = countNonZero(src);\r
+                        if (result != right)\r
+                        {\r
+                         cout << "Number of experiment: " << i << endl;\r
+                         cout << "Method of data generation: RANDOM" << endl;\r
+                         print_information(right, result);\r
+                         CV_Error(CORE_COUNTNONZERO_ERROR_COUNT, MESSAGE_ERROR_COUNT);\r
+                         return;\r
+                        }\r
+\r
+                        break;\r
+                  }\r
+\r
+   case 2: {\r
+                       int count_non_zero = rng.next()%(w*h);\r
+               generate_src_data(Size(w, h), current_type, count_non_zero);\r
+                       int result = countNonZero(src);\r
+                       if (result != count_non_zero)\r
                        {\r
-                        Vec4f value(cv::randu<float>(), cv::randu<float>(), cv::randu<float>(), cv::randu<float>());\r
-                        n += sign(cv::norm(value) > eps_32);\r
-                        src.at<Vec4f>(i, j) = value;\r
+                        cout << "Number of experiment: " << i << endl;\r
+                        cout << "Method of data generation: HALF-RANDOM" << endl;\r
+                        print_information(count_non_zero, result);\r
+                        CV_Error(CORE_COUNTNONZERO_ERROR_COUNT, MESSAGE_ERROR_COUNT);\r
+                        return;\r
                        }\r
 \r
                        break;\r
-                 }\r
-\r
-         case CV_64F:\r
-                 {\r
-                  if (channels == 1)\r
-                       {\r
-                        double value = cv::randu<double>();\r
-                        n += sign(fabs(value) > eps_64);\r
-                        src.at<double>(i, j) = value;  \r
-                       }\r
-                       \r
-                       else \r
-\r
-                       if (channels == 2)\r
-                       {\r
-                        Vec2d value(cv::randu<double>(), cv::randu<double>());\r
-                        n += sign(cv::norm(value) > eps_64); \r
-                        src.at<Vec2d>(i, j) = value; \r
-                       }\r
-\r
-                       else \r
+                  }\r
 \r
-                       if (channels == 3)\r
-                       {\r
-                        Vec3d value(cv::randu<double>(), cv::randu<double>(), cv::randu<double>());\r
-                        n += sign(cv::norm(value) > eps_64); \r
-                        src.at<Vec3d>(i, j) = value;\r
-                       }\r
-                               \r
-                       else\r
-                               \r
+   case 3: {\r
+                       int distribution = cv::randu<uchar>()%2;\r
+                       generate_src_stat_data(Size(w, h), current_type, distribution);\r
+                       int right = get_count_non_zero(), result = countNonZero(src);\r
+                       if (right != result)\r
                        {\r
-                        Vec4d value(cv::randu<double>(), cv::randu<double>(), cv::randu<double>(), cv::randu<double>());\r
-                        n += sign(cv::norm(value) > eps_64);\r
-                        src.at<Vec4d>(i, j) = value;\r
+                        cout << "Number of experiment: " << i << endl;\r
+                        cout << "Method of data generation: STATISTIC" << endl;\r
+                        print_information(right, result);\r
+                        CV_Error(CORE_COUNTNONZERO_ERROR_COUNT, MESSAGE_ERROR_COUNT);\r
+                        return;\r
                        }\r
 \r
-                  break;\r
-                 }\r
+                       break;\r
+                  }\r
 \r
-         default: break;\r
-        }\r
+   default: break;\r
+  }\r
  }\r
\r
-}\r
-\r
-void CV_CountNonZeroTest::generate_src_float_data(cv::Size size, int type, int channels, int distribution)\r
-{\r
- src.create(size, CV_MAKETYPE(type, channels));\r
-\r
- double mean = 0.0, sigma = 1.0;\r
- double left = -1.0, right = 1.0;\r
-\r
- RNG& rng = ts->get_rng();\r
-\r
- if (distribution == RNG::NORMAL) \r
-        rng.fill(src, RNG::NORMAL, Scalar::all(mean), Scalar::all(sigma));\r
- else if (distribution == RNG::UNIFORM)\r
-        rng.fill(src, RNG::UNIFORM, Scalar::all(left), Scalar::all(right));\r
-}\r
-\r
-void CV_CountNonZeroTest::run(int)\r
-{\r
\r
 }\r
 \r
-TEST (Core_CountNonZero, accuracy) { CV_CountNonZeroTest test; test.safe_run(); }
\ No newline at end of file
+// TEST (Core_CountNonZero, accuracy) { CV_CountNonZeroTest test; test.safe_run(); }
\ No newline at end of file
index 2321953..d150a89 100644 (file)
@@ -22,7 +22,17 @@ CV_BoundingRectTest::~CV_BoundingRectTest() {}
 \r
 void CV_BoundingRectTest::run(int)\r
 {\r
+ const int MAX_WIDTH = 100;\r
+ const int MAX_HEIGHT = 100;\r
+ const int N = 100;\r
 \r
+ RNG& rng = ts->get_rng();\r
+\r
+ for (size_t i = 0; i < N; ++i)\r
+ {\r
+  int w = rng.next()%MAX_WIDTH + 1, h = rng.next()%MAX_HEIGHT + 1;\r
+  cv::Mat src(h, w, CV_8U); cv::randu(src, Scalar_<bool>::all(false), Scalar_<bool>::all(true));\r
+ }\r
 }\r
 \r
 TEST (Imgproc_BoundingRect, accuracy) { CV_BoundingRectTest test; test.safe_run(); }
\ No newline at end of file