Merge pull request #839 from alicevision/dev/codeStructure

Avoid circular dependency
alicevision · Jul 28, 2020 · b933509 · b933509
2 parents abe257f + 8f3422d
commit b933509
Show file tree

Hide file tree

Showing 34 changed files with 367 additions and 329 deletions.
diff --git a/src/aliceVision/feature/CMakeLists.txt b/src/aliceVision/feature/CMakeLists.txt
@@ -14,15 +14,15 @@ set(features_files_headers
   Descriptor.hpp
   feature.hpp
   FeaturesPerView.hpp
+  Hamming.hpp
   ImageDescriber.hpp
   imageDescriberCommon.hpp
   KeypointSet.hpp
+  metric.hpp
   PointFeature.hpp
   Regions.hpp
   regionsFactory.hpp
   RegionsPerView.hpp
-  selection.hpp
-  svgVisualization.hpp
 )
 
 # Sources
@@ -34,8 +34,6 @@ set(features_files_sources
   FeaturesPerView.cpp
   ImageDescriber.cpp
   imageDescriberCommon.cpp
-  selection.cpp
-  svgVisualization.cpp
 )
 
 # CCTAG ImageDescriber
@@ -92,3 +90,4 @@ endif()
 
 # Unit tests
 alicevision_add_test(features_test.cpp NAME "features" LINKS aliceVision_feature)
+alicevision_add_test(metric_test.cpp   NAME "descriptor_metric"   LINKS aliceVision_feature)
diff --git a/src/aliceVision/matching/Hamming.hpp → src/aliceVision/feature/Hamming.hpp b/src/aliceVision/matching/Hamming.hpp → src/aliceVision/feature/Hamming.hpp
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <aliceVision/matching/metric.hpp>
+#include "metric.hpp"
 
 #include <bitset>
 
@@ -29,7 +29,7 @@ typedef unsigned __int64 uint64_t;
 // For maximal performance SSE4 must be enable for builtin popcount activation.
 
 namespace aliceVision {
-namespace matching {
+namespace feature {
 
 #undef PLATFORM_64_BIT
 #undef PLATFORM_32_BIT
@@ -180,5 +180,5 @@ struct SquaredHamming
   }
 };
 
-}  // namespace matching
+}  // namespace feature
 }  // namespace aliceVision
diff --git a/src/aliceVision/feature/Regions.hpp b/src/aliceVision/feature/Regions.hpp
@@ -11,7 +11,7 @@
 #include <aliceVision/numeric/numeric.hpp>
 #include <aliceVision/feature/PointFeature.hpp>
 #include <aliceVision/feature/Descriptor.hpp>
-#include <aliceVision/matching/metric.hpp>
+#include <aliceVision/feature/metric.hpp>
 
 #include <string>
 #include <cstddef>
@@ -152,13 +152,13 @@ struct SquaredMetric;
 template<typename T>
 struct SquaredMetric<T, ERegionType::Scalar>
 {
-  using Metric = matching::L2_Vectorized<T>;
+  using Metric = L2_Vectorized<T>;
 };
 
 template<typename T>
 struct SquaredMetric<T, ERegionType::Binary>
 {
-  using Metric = matching::SquaredHamming<T>;
+  using Metric = SquaredHamming<T>;
 };
 
 

diff --git a/src/aliceVision/matching/metric.hpp → src/aliceVision/feature/metric.hpp b/src/aliceVision/matching/metric.hpp → src/aliceVision/feature/metric.hpp
@@ -7,8 +7,9 @@
 
 #pragma once
 
-#include "aliceVision/matching/Hamming.hpp"
-#include "aliceVision/numeric/Accumulator.hpp"
+#include "Hamming.hpp"
+
+#include <aliceVision/numeric/Accumulator.hpp>
 #include <aliceVision/config.hpp>
 
 #if ALICEVISION_IS_DEFINED(ALICEVISION_HAVE_SSE)
@@ -18,8 +19,9 @@
 
 #include <cstddef>
 
+
 namespace aliceVision {
-namespace matching {
+namespace feature {
 
 /// Squared Euclidean distance functor.
 template<class T>
@@ -136,5 +138,5 @@ struct L2_Vectorized<float>
 
 #endif // ALICEVISION_HAVE_SSE
 
-}  // namespace matching
+}  // namespace feature
 }  // namespace aliceVision
diff --git a/src/aliceVision/matching/metric_test.cpp → src/aliceVision/feature/metric_test.cpp b/src/aliceVision/matching/metric_test.cpp → src/aliceVision/feature/metric_test.cpp
@@ -5,7 +5,8 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "aliceVision/matching/metric.hpp"
+#include <aliceVision/feature/metric.hpp>
+
 #include <iostream>
 #include <string>
 
@@ -16,7 +17,7 @@
 
 using namespace std;
 using namespace aliceVision;
-using namespace matching;
+using namespace feature;
 
 template<typename Metric>
 typename Metric::ResultType DistanceT()

diff --git a/src/aliceVision/feature/selection.cpp b/src/aliceVision/feature/selection.cpp
diff --git a/src/aliceVision/feature/selection.hpp b/src/aliceVision/feature/selection.hpp
diff --git a/src/aliceVision/geometry/Pose3.hpp b/src/aliceVision/geometry/Pose3.hpp
@@ -78,6 +78,9 @@ class Pose3
       pose._rotation = _rotation * R.transpose();
       return pose;
     }
+
+public:
+    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
 };
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,6 +78,9 @@ class Pose3 @@
           pose._rotation = _rotation * R.transpose();
           return pose;
         }
+    public:
+        EIGEN_MAKE_ALIGNED_OPERATOR_NEW
     };
     /**
@@ Expand Down @@