changed:调整特征信息类型定义位置和特重命名征操作头文件

GengGode · Dec 7, 2023 · b9488ed · b9488ed
1 parent e6d214c
commit b9488ed
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/source/algorithms/algorithms.features.h → source/algorithms/algorithms.feature.h b/source/algorithms/algorithms.features.h → source/algorithms/algorithms.feature.h
@@ -1,23 +1,14 @@
 #pragma once
 #include "algorithms.include.h"
 
-namespace tianli::algorithms::features
+namespace tianli::algorithms::feature
 {
-    struct features
+    static features from_image(const cv::Ptr<cv::xfeatures2d::SURF> &detector, const cv::Mat &image, const cv::Mat &mask = cv::Mat())
     {
-        std::vector<size_t> indexs;
-        std::vector<cv::KeyPoint> keypoints;
-        cv::Mat descriptors;
-
-        size_t size() const { return keypoints.size(); }
-
-        static features from_image(const cv::Ptr<cv::xfeatures2d::SURF> &detector, const cv::Mat &image, const cv::Mat &mask = cv::Mat())
-        {
-            features fts;
-            detector->detectAndCompute(image, mask, fts.keypoints, fts.descriptors);
-            return fts;
-        }
-    };
+        features fts;
+        detector->detectAndCompute(image, mask, fts.keypoints, fts.descriptors);
+        return fts;
+    }
 
     static features merge(const features &features_upper, const features &features_lower)
     {

diff --git a/source/algorithms/algorithms.include.h b/source/algorithms/algorithms.include.h
@@ -29,6 +29,14 @@ struct odometer_config
     double scale = 1.0;
 };
 
+struct features
+{
+    std::vector<size_t> indexs;
+    std::vector<cv::KeyPoint> keypoints;
+    cv::Mat descriptors;
+    size_t size() const { return keypoints.size(); }
+};
+
 class point_index
 {
 public:

diff --git a/tests/algorithms_feature_merge/main.cpp b/tests/algorithms_feature_merge/main.cpp
@@ -4,9 +4,9 @@
 #include <opencv2/xfeatures2d/nonfree.hpp>
 #include "resources/binary/resources.binary.h"
 #include <fmt/format.h>
-#include "algorithms/algorithms.features.h"
+#include "algorithms/algorithms.feature.h"
 
-using namespace tianli::algorithms::features;
+using namespace tianli::algorithms::feature;
 
 cv::Mat get(int i)
 {
@@ -23,7 +23,7 @@ cv::Ptr<cv::xfeatures2d::SURF> detector = cv::xfeatures2d::SURF::create();
 
 features gen(int i)
 {
-    features fts = features::from_image(detector, get(i));
+    features fts = from_image(detector, get(i));
     cv::Mat mat;
     drawKeypoints(get(i), fts.keypoints, mat, cv::Scalar::all(-1), cv::DrawMatchesFlags::DRAW_RICH_KEYPOINTS);
     cv::imwrite(fmt::format("org_key_{}.png", i), mat);

diff --git a/tests/container_treeset/main.cpp b/tests/container_treeset/main.cpp
@@ -3,11 +3,11 @@
 #include <iostream>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 #include <fmt/format.h>
-#include "algorithms/algorithms.features.h"
+#include "algorithms/algorithms.feature.h"
 #include "algorithms/container/container.set.h"
 #include "resources/Resources.h"
 
-using namespace tianli::algorithms::features;
+using namespace tianli::algorithms::feature;
 #include <psapi.h>