From ac77615e895e08ef8c5fc0e33df8abfb8e6120ef Mon Sep 17 00:00:00 2001
From: Joan Sola <jsola@iri.upc.edu>
Date: Thu, 3 May 2018 18:10:58 +0200
Subject: [PATCH] Organize includes

---
 .../test_processor_tracker_landmark_image.cpp |  7 ++++--
 src/processor_tracker_landmark_image.cpp      | 17 ++++++++------
 src/processor_tracker_landmark_image.h        | 22 ++++++++++---------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/examples/test_processor_tracker_landmark_image.cpp b/src/examples/test_processor_tracker_landmark_image.cpp
index 66202289d..54bf2f8a8 100644
--- a/src/examples/test_processor_tracker_landmark_image.cpp
+++ b/src/examples/test_processor_tracker_landmark_image.cpp
@@ -1,18 +1,21 @@
 //std
 #include <iostream>
 
-#include "../capture_pose.h"
+#include "processor_tracker_landmark_image.h"
+
 //Wolf
 #include "wolf.h"
 #include "problem.h"
 #include "state_block.h"
 #include "processor_odom_3D.h"
 #include "sensor_odom_3D.h"
+#include "sensor_camera.h"
+#include "capture_image.h"
+#include "capture_pose.h"
 #include "ceres_wrapper/ceres_manager.h"
 
 // Vision utils includes
 #include <vision_utils.h>
-#include "../processor_tracker_landmark_image.h"
 #include <sensors.h>
 #include <common_class/buffer.h>
 #include <common_class/frame.h>
diff --git a/src/processor_tracker_landmark_image.cpp b/src/processor_tracker_landmark_image.cpp
index 6bcbba4a1..0d8caf749 100644
--- a/src/processor_tracker_landmark_image.cpp
+++ b/src/processor_tracker_landmark_image.cpp
@@ -1,14 +1,17 @@
 #include "processor_tracker_landmark_image.h"
 
-#include "landmark_corner_2D.h"
-#include "landmark_AHP.h"
-#include "feature_point_image.h"
-#include "constraint_corner_2D.h"
+#include "capture_image.h"
 #include "constraint_AHP.h"
-#include "sensor_camera.h"
-#include "pinhole_tools.h"
-#include "trajectory_base.h"
+#include "feature_base.h"
+#include "feature_point_image.h"
+#include "frame_base.h"
+#include "logging.h"
 #include "map_base.h"
+#include "pinhole_tools.h"
+#include "problem.h"
+#include "sensor_camera.h"
+#include "state_block.h"
+#include "time_stamp.h"
 
 // vision_utils
 #include <detectors.h>
diff --git a/src/processor_tracker_landmark_image.h b/src/processor_tracker_landmark_image.h
index ca2f5fa90..8d8b8fd42 100644
--- a/src/processor_tracker_landmark_image.h
+++ b/src/processor_tracker_landmark_image.h
@@ -2,24 +2,26 @@
 #define PROCESSOR_TRACKER_LANDMARK_IMAGE_H
 
 // Wolf includes
-#include "sensor_camera.h"
-#include "capture_image.h"
-#include "feature_point_image.h"
-#include "state_block.h"
-#include "state_quaternion.h"
-#include "processor_tracker_landmark.h"
+
 #include "landmark_AHP.h"
-#include "constraint_AHP.h"
+#include "landmark_match.h"
 #include "processor_params_image.h"
+#include "processor_tracker_landmark.h"
+#include "wolf.h"
+
 #include <algorithms/activesearch/alg_activesearch.h>
 #include <descriptors/descriptor_base.h>
 #include <detectors/detector_base.h>
 #include <matchers/matcher_base.h>
 
+#include <opencv2/core/mat.hpp>
+#include <opencv2/core/mat.inl.hpp>
+#include <opencv2/core/types.hpp>
 
-// General includes
-#include <cmath>
-#include <complex>      // std::complex, std::norm
+#include <list>
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace wolf {
 
-- 
GitLab