テーブル作成計画を全探索するように変更

Author: kyaco

modules/ximgproc/src/sparse_table_morphology.cpp

@@ -8,7 +8,6 @@
 #include <iostream>
 #include <stack>
 #include <algorithm>
-#include <queue>
 
 namespace cv {
 namespace ximgproc {
@@ -134,40 +133,46 @@ std::vector<StStep> planSparseTableConstruction(std::vector<std::vector<bool>> s
 * https://link.springer.com/article/10.1007/BF01758762
 *
 */
-    auto comparePos = [](Point lp, Point rp) {
-        int diffx = lp.x - rp.x;
-        int diffy = lp.y - rp.y;
-        int diff = diffx + diffy;
-        if (diff != 0) return diff < 0;
-        if (diffx != 0) return diffx < 0;
-        return diffy < 0;
-        };
-    std::priority_queue<Point, std::vector<Point>, decltype(comparePos)> points{ comparePos };
+    std::vector<Point> pos;
     sparseMatMap[0][0] = true;
     for (int r = 0; r < sparseMatMap.size(); r++)
         for (int c = 0; c < sparseMatMap[r].size(); c++)
-            if (sparseMatMap[r][c]) points.push(Point(c, r));
-
+            if (sparseMatMap[r][c]) pos.emplace_back(c, r);
     std::vector<StStep> plan;
-    while (points.size() >= 2)
+    while(pos.size() > 1)
     {
-        Point p1 = points.top();
-        points.pop();
-        Point p2 = points.top();
-        points.pop();
-        int newX = min(p1.x, p2.x);
-        int newY = min(p1.y, p2.y);
-        if (!sparseMatMap[newY][newX])
+        int maxCost = -1;
+        int maxI = 0;
+        int maxJ = 0;
+        int maxX = 0;
+        int maxY = 0;
+        for (int i = 0; i < pos.size(); i++)
         {
-            sparseMatMap[newY][newX] = true;
-            points.push(Point(newX, newY));
+            for (int j = i + 1; j < pos.size(); j++)
+            {
+                int _x = min(pos[i].x, pos[j].x);
+                int _y = min(pos[i].y, pos[j].y);
+                int cost = _x + _y;
+                if (maxCost < cost)
+                {
+                    maxCost = cost;
+                    maxI = i;
+                    maxJ = j;
+                    maxX = _x;
+                    maxY = _y;
+                }
+            }
         }
-
-        for (int col = p1.x - 1; col >= newX; col--) plan.emplace_back(p1.y, col, Dim::Col);
-        for (int row = p1.y - 1; row >= newY; row--) plan.emplace_back(row, p1.x, Dim::Row);
-        for (int col = p2.x - 1; col >= newX; col--) plan.emplace_back(p2.y, col, Dim::Col);
-        for (int row = p2.y - 1; row >= newY; row--) plan.emplace_back(row, p2.x, Dim::Row);
+        for (int col = pos[maxI].x - 1; col >= maxX; col--) plan.emplace_back(pos[maxI].y, col, Dim::Col);
+        for (int row = pos[maxI].y - 1; row >= maxY; row--) plan.emplace_back(row, maxX, Dim::Row);
+        for (int col = pos[maxJ].x - 1; col >= maxX; col--) plan.emplace_back(pos[maxJ].y, col, Dim::Col);
+        for (int row = pos[maxJ].y - 1; row >= maxY; row--) plan.emplace_back(row, maxX, Dim::Row);
+
+        pos[maxI] = Point(maxX, maxY);
+        std::swap(pos[maxJ], pos[pos.size() - 1]);
+        pos.pop_back();
     }
+
     std::reverse(plan.begin(), plan.end());
     return plan;
 }

modules/ximgproc/test/test_sparse_table_morphology.cpp

@@ -12,7 +12,7 @@ namespace stMorph {
 TEST(ximgproc_SparseTableMorph, compare_with_original_erode)
 {
     // preparation
-    int kRadius = 10;
+    int kRadius = 15;
     //Size sz(200, 150);
      Size sz = szVGA;
     int type = CV_8UC3;
@@ -23,7 +23,7 @@ TEST(ximgproc_SparseTableMorph, compare_with_original_erode)
     Mat expected(sz, type);
     Mat actual(sz, type);
     Size kernelSize(kSize, kSize);
-    Mat kernel = getStructuringElement(cv::MorphShapes::MORPH_ELLIPSE, kernelSize, Point(kRadius, kRadius));
+    Mat kernel = getStructuringElement(cv::MorphShapes::MORPH_RECT, kernelSize, Point(kRadius, kRadius));
 
     src.setTo(240);
     putText(src, "A", Point(sz.height / 5 * 1, sz.height / 20 * 15), HersheyFonts::FONT_HERSHEY_TRIPLEX, 10, Scalar(255, 40, 40), 30, LineTypes::FILLED);
@@ -71,9 +71,6 @@ TEST(ximgproc_SparseTableMorph, compare_with_original_erode)
 
 TEST(develop, POW2RECT_COVERING)
 {
-    int kSize = 11;
-    Size kernelSize(kSize, kSize);
-    //Mat kernel = getStructuringElement(MorphShapes::MORPH_ELLIPSE, kernelSize);
     uchar ary[] {
         0, 1, 0, 1, 0, 1, 0, 1,
         1, 1, 0, 1, 1, 1, 1, 1,
@@ -87,7 +84,7 @@ TEST(develop, POW2RECT_COVERING)
     Mat kernel(8, 8, CV_8UC1, ary);
     std::vector<Rect> rects = ximgproc::stMorph::genPow2RectsToCoverKernel(kernel);
 
-    int rate = 40;
+    int rate = 20;
     resize(kernel * 255, kernel, Size(), rate, rate, InterpolationFlags::INTER_NEAREST);
     cvtColor(kernel, kernel, cv::COLOR_GRAY2BGR);
     Scalar color[20]{
@@ -121,9 +118,9 @@ TEST(develop, PLANNING)
         std::vector<bool>{0,0,0,0,0,0,1,0},
         std::vector<bool>{0,0,0,0,0,1,0,0},
         std::vector<bool>{0,0,0,0,1,0,0,0},
-        std::vector<bool>{0,0,0,0,0,1,0,0},
+        std::vector<bool>{0,0,0,1,0,0,0,0},
         std::vector<bool>{0,0,1,0,0,0,0,0},
-        std::vector<bool>{0,1,0,0,1,0,0,0},
+        std::vector<bool>{0,1,0,0,0,0,0,0},
         std::vector<bool>{1,0,0,0,0,0,0,0},
     };
     auto res = ximgproc::stMorph::planSparseTableConstruction(map);