From 3ea0f9422f6db51a7b471dd8a0dc263df6349f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaquim=20Casals=20Bu=C3=B1uel?= <jcasals@iri.upc.edu>
Date: Thu, 31 Jan 2019 11:56:35 +0100
Subject: [PATCH] Refactored vision_utils files
---
include/base/constraint/constraint_autodiff_trifocal.h | 1 +
{src => include/base}/landmark/landmark_point_3D.h | 0
.../base}/processor/processor_tracker_feature_trifocal.h | 0
src/landmark/landmark_AHP.cpp | 2 +-
src/landmark/landmark_point_3D.cpp | 2 +-
src/processor/processor_tracker_feature_image.cpp | 2 +-
src/processor/processor_tracker_feature_trifocal.cpp | 6 +++---
src/yaml/processor_image_yaml.cpp | 2 +-
src/yaml/processor_tracker_feature_trifocal_yaml.cpp | 2 +-
test/gtest_constraint_autodiff_trifocal.cpp | 8 ++++----
test/gtest_processor_tracker_feature_trifocal.cpp | 2 +-
11 files changed, 14 insertions(+), 13 deletions(-)
rename {src => include/base}/landmark/landmark_point_3D.h (100%)
rename {src => include/base}/processor/processor_tracker_feature_trifocal.h (100%)
diff --git a/include/base/constraint/constraint_autodiff_trifocal.h b/include/base/constraint/constraint_autodiff_trifocal.h
index d3844c350..e10c59649 100644
--- a/include/base/constraint/constraint_autodiff_trifocal.h
+++ b/include/base/constraint/constraint_autodiff_trifocal.h
@@ -133,6 +133,7 @@ ConstraintAutodiffTrifocal::ConstraintAutodiffTrifocal(
const ProcessorBasePtr& _processor_ptr,
bool _apply_loss_function,
ConstraintStatus _status) : ConstraintAutodiff( "TRIFOCAL PLP",
+ nullptr,
nullptr,
_feature_origin_ptr,
nullptr,
diff --git a/src/landmark/landmark_point_3D.h b/include/base/landmark/landmark_point_3D.h
similarity index 100%
rename from src/landmark/landmark_point_3D.h
rename to include/base/landmark/landmark_point_3D.h
diff --git a/src/processor/processor_tracker_feature_trifocal.h b/include/base/processor/processor_tracker_feature_trifocal.h
similarity index 100%
rename from src/processor/processor_tracker_feature_trifocal.h
rename to include/base/processor/processor_tracker_feature_trifocal.h
diff --git a/src/landmark/landmark_AHP.cpp b/src/landmark/landmark_AHP.cpp
index f1a683978..17a22bac3 100644
--- a/src/landmark/landmark_AHP.cpp
+++ b/src/landmark/landmark_AHP.cpp
@@ -2,7 +2,7 @@
#include "base/state_homogeneous_3D.h"
#include "base/factory.h"
-#include "yaml/yaml_conversion.h"
+#include "base/yaml/yaml_conversion.h"
namespace wolf {
diff --git a/src/landmark/landmark_point_3D.cpp b/src/landmark/landmark_point_3D.cpp
index 0deed3861..dda3984e9 100644
--- a/src/landmark/landmark_point_3D.cpp
+++ b/src/landmark/landmark_point_3D.cpp
@@ -1,4 +1,4 @@
-#include "landmarks/landmark_point_3D.h"
+#include "base/landmark/landmark_point_3D.h"
namespace wolf {
diff --git a/src/processor/processor_tracker_feature_image.cpp b/src/processor/processor_tracker_feature_image.cpp
index c7dc1866f..716a2cca7 100644
--- a/src/processor/processor_tracker_feature_image.cpp
+++ b/src/processor/processor_tracker_feature_image.cpp
@@ -392,7 +392,7 @@ ProcessorBasePtr ProcessorTrackerFeatureImage::create(const std::string& _unique
} // namespace wolf
// Register in the SensorFactory
-#include "processor_factory.h"
+#include "base/processor/processor_factory.h"
namespace wolf {
WOLF_REGISTER_PROCESSOR("IMAGE FEATURE", ProcessorTrackerFeatureImage)
} // namespace wolf
diff --git a/src/processor/processor_tracker_feature_trifocal.cpp b/src/processor/processor_tracker_feature_trifocal.cpp
index 2ee0b277f..6a0fa198f 100644
--- a/src/processor/processor_tracker_feature_trifocal.cpp
+++ b/src/processor/processor_tracker_feature_trifocal.cpp
@@ -1,10 +1,10 @@
// wolf
-#include "processor/processor_tracker_feature_trifocal.h"
+#include "base/processor/processor_tracker_feature_trifocal.h"
#include "base/sensor/sensor_camera.h"
#include "base/feature/feature_point_image.h"
-#include "constraints/constraint_autodiff_trifocal.h"
+#include "base/constraint/constraint_autodiff_trifocal.h"
#include "base/capture/capture_image.h"
// vision_utils
@@ -452,7 +452,7 @@ ProcessorBasePtr ProcessorTrackerFeatureTrifocal::create(const std::string& _uni
} // namespace wolf
// Register in the ProcessorFactory
-#include "processor_factory.h"
+#include "base/processor/processor_factory.h"
namespace wolf {
WOLF_REGISTER_PROCESSOR("TRACKER FEATURE TRIFOCAL", ProcessorTrackerFeatureTrifocal)
} // namespace wolf
diff --git a/src/yaml/processor_image_yaml.cpp b/src/yaml/processor_image_yaml.cpp
index 051174ef5..a02d44208 100644
--- a/src/yaml/processor_image_yaml.cpp
+++ b/src/yaml/processor_image_yaml.cpp
@@ -65,4 +65,4 @@ const bool WOLF_UNUSED registered_prc_image_feature_par = ProcessorParamsFactory
const bool WOLF_UNUSED registered_prc_image_landmark_par = ProcessorParamsFactory::get().registerCreator("IMAGE LANDMARK", createProcessorParamsImage);
}
-
+}
diff --git a/src/yaml/processor_tracker_feature_trifocal_yaml.cpp b/src/yaml/processor_tracker_feature_trifocal_yaml.cpp
index 2a6ae97f7..fd110aa0e 100644
--- a/src/yaml/processor_tracker_feature_trifocal_yaml.cpp
+++ b/src/yaml/processor_tracker_feature_trifocal_yaml.cpp
@@ -6,7 +6,7 @@
*/
// wolf yaml
-#include "processor/processor_tracker_feature_trifocal.h"
+#include "base/processor/processor_tracker_feature_trifocal.h"
#include "base/yaml/yaml_conversion.h"
// wolf
diff --git a/test/gtest_constraint_autodiff_trifocal.cpp b/test/gtest_constraint_autodiff_trifocal.cpp
index 1615cc4ab..6447dcfe4 100644
--- a/test/gtest_constraint_autodiff_trifocal.cpp
+++ b/test/gtest_constraint_autodiff_trifocal.cpp
@@ -2,10 +2,10 @@
#include "base/logging.h"
-#include "ceres_wrapper/ceres_manager.h"
-#include "processors/processor_tracker_feature_trifocal.h"
+#include "base/ceres_wrapper/ceres_manager.h"
+#include "base/processor/processor_tracker_feature_trifocal.h"
#include "base/capture/capture_image.h"
-#include "constraints/constraint_autodiff_trifocal.h"
+#include "base/constraint/constraint_autodiff_trifocal.h"
using namespace Eigen;
using namespace wolf;
@@ -849,7 +849,7 @@ TEST_F(ConstraintAutodiffTrifocalMultiPointTest, solve_multi_point_scale)
}
}
-#include "constraints/constraint_autodiff_distance_3D.h"
+#include "base/constraint/constraint_autodiff_distance_3D.h"
TEST_F(ConstraintAutodiffTrifocalMultiPointTest, solve_multi_point_distance)
{
diff --git a/test/gtest_processor_tracker_feature_trifocal.cpp b/test/gtest_processor_tracker_feature_trifocal.cpp
index 47e42c577..d182bb4f3 100644
--- a/test/gtest_processor_tracker_feature_trifocal.cpp
+++ b/test/gtest_processor_tracker_feature_trifocal.cpp
@@ -5,7 +5,7 @@
#include "vision_utils.h"
-#include "processors/processor_tracker_feature_trifocal.h"
+#include "base/processor/processor_tracker_feature_trifocal.h"
#include "base/processor/processor_odom_3D.h"
#include "base/capture/capture_image.h"
#include "base/sensor/sensor_camera.h"
--
GitLab