From 1c4d96bcbdb4f69f36a7c4da309a85387c2235ed Mon Sep 17 00:00:00 2001 From: Joaquim Casals <jcasals@iri.upc.edu> Date: Fri, 3 May 2019 12:20:23 +0200 Subject: [PATCH] Fixed includes rename base -> core --- cmake_modules/Findwolf.cmake | 4 ++-- hello_wolf/capture_range_bearing.h | 2 +- hello_wolf/factor_bearing.h | 2 +- hello_wolf/factor_range_bearing.h | 2 +- hello_wolf/feature_range_bearing.h | 2 +- hello_wolf/hello_wolf.cpp | 8 +++---- hello_wolf/landmark_point_2D.h | 2 +- hello_wolf/processor_range_bearing.cpp | 2 +- hello_wolf/processor_range_bearing.h | 2 +- hello_wolf/sensor_range_bearing.cpp | 4 ++-- hello_wolf/sensor_range_bearing.h | 2 +- include/gnss/capture/capture_gnss_fix.h | 2 +- .../gnss/capture/capture_gnss_single_diff.h | 2 +- include/gnss/factor/factor_gnss_fix_2D.h | 6 ++--- include/gnss/factor/factor_gnss_fix_3D.h | 6 ++--- .../gnss/factor/factor_gnss_single_diff_2D.h | 6 ++--- include/gnss/feature/feature_gnss_fix.h | 2 +- .../gnss/feature/feature_gnss_single_diff.h | 2 +- include/gnss/processor/processor_gnss_fix.h | 2 +- .../processor/processor_gnss_single_diff.h | 2 +- include/gnss/sensor/sensor_gnss.h | 2 +- ...serialization_local_parametrization_base.h | 2 +- ...zation_local_parametrization_homogeneous.h | 2 +- ...ization_local_parametrization_quaternion.h | 2 +- .../cereal/serialization_node_base.h | 2 +- .../serialization_processor_odom2d_params.h | 2 +- .../serialization_processor_odom3d_params.h | 2 +- .../serialization_processor_params_base.h | 2 +- .../serialization_sensor_intrinsic_base.h | 2 +- .../serialization_sensor_odom2d_intrinsic.h | 2 +- .../cereal/serialization_time_stamp.h | 2 +- src/examples/solver/test_ccolamd.cpp | 2 +- src/examples/solver/test_iQR_wolf2.cpp | 8 +++---- src/examples/test_2_lasers_offline.cpp | 16 +++++++------- src/examples/test_analytic_odom_factor.cpp | 4 ++-- src/examples/test_autodiff.cpp | 4 ++-- src/examples/test_capture_laser_2D.cpp | 2 +- src/examples/test_ceres_2_lasers.cpp | 16 +++++++------- .../test_ceres_2_lasers_polylines.cpp | 16 +++++++------- src/examples/test_diff_drive.cpp | 10 ++++----- src/examples/test_eigen_quaternion.cpp | 2 +- src/examples/test_factor_AHP.cpp | 14 ++++++------ src/examples/test_factor_imu.cpp | 20 ++++++++--------- src/examples/test_factor_odom_3D.cpp | 2 +- src/examples/test_faramotics_simulation.cpp | 8 +++---- src/examples/test_image.cpp | 8 +++---- src/examples/test_imuDock.cpp | 18 +++++++-------- src/examples/test_imuDock_autoKFs.cpp | 18 +++++++-------- src/examples/test_imuPlateform_Offline.cpp | 22 +++++++++---------- src/examples/test_imu_constrained0.cpp | 22 +++++++++---------- src/examples/test_kf_callback.cpp | 8 +++---- src/examples/test_map_yaml.cpp | 14 ++++++------ src/examples/test_mpu.cpp | 14 ++++++------ src/examples/test_processor_imu.cpp | 14 ++++++------ src/examples/test_processor_imu_jacobians.cpp | 12 +++++----- src/examples/test_processor_odom_3D.cpp | 14 ++++++------ .../test_processor_tracker_feature.cpp | 12 +++++----- .../test_processor_tracker_landmark.cpp | 12 +++++----- .../test_processor_tracker_landmark_image.cpp | 20 ++++++++--------- src/examples/test_projection_points.cpp | 2 +- src/examples/test_simple_AHP.cpp | 18 +++++++-------- src/examples/test_sort_keyframes.cpp | 8 +++---- src/examples/test_sparsification.cpp | 8 +++---- src/examples/test_state_quaternion.cpp | 6 ++--- src/examples/test_tracker_ORB.cpp | 2 +- src/examples/test_wolf_autodiffwrapper.cpp | 4 ++-- src/examples/test_wolf_factories.cpp | 18 +++++++-------- src/examples/test_wolf_imported_graph.cpp | 4 ++-- src/examples/test_wolf_logging.cpp | 4 ++-- src/examples/test_wolf_prunning.cpp | 6 ++--- src/examples/test_wolf_root.cpp | 2 +- src/examples/test_yaml.cpp | 4 ++-- src/examples/test_yaml_conversions.cpp | 2 +- src/processor/processor_gnss_fix.cpp | 2 +- src/processor/processor_gnss_single_diff.cpp | 2 +- src/sensor/sensor_gnss.cpp | 6 ++--- src/yaml/processor_IMU_yaml.cpp | 6 ++--- src/yaml/processor_image_yaml.cpp | 6 ++--- src/yaml/processor_odom_3D_yaml.cpp | 6 ++--- ...rocessor_tracker_feature_trifocal_yaml.cpp | 6 ++--- src/yaml/sensor_IMU_yaml.cpp | 6 ++--- src/yaml/sensor_camera_yaml.cpp | 6 ++--- src/yaml/sensor_laser_2D_yaml.cpp | 8 +++---- src/yaml/sensor_odom_3D_yaml.cpp | 6 ++--- test/gtest_factor_gnss_fix_2D.cpp | 4 ++-- test/gtest_factor_gnss_single_diff_2D.cpp | 10 ++++----- .../gtest_serialization_eigen_geometry.cpp | 2 +- .../gtest_serialization_eigen_sparse.cpp | 2 +- 88 files changed, 291 insertions(+), 291 deletions(-) diff --git a/cmake_modules/Findwolf.cmake b/cmake_modules/Findwolf.cmake index b0352427d..469f3372a 100644 --- a/cmake_modules/Findwolf.cmake +++ b/cmake_modules/Findwolf.cmake @@ -2,9 +2,9 @@ FIND_PATH( wolf_INCLUDE_DIRS NAMES wolf.found - PATHS /usr/local/include/iri-algorithms/wolf/base) + PATHS /usr/local/include/iri-algorithms/wolf/plugin_core) #change INCLUDE_DIRS to its parent directory -get_filename_component(wolf_INCLUDE_DIRS ${wolf_INCLUDE_DIRS} DIRECTORY) +# get_filename_component(wolf_INCLUDE_DIRS ${wolf_INCLUDE_DIRS} DIRECTORY) MESSAGE("Found wolf include dirs: ${wolf_INCLUDE_DIRS}") FIND_LIBRARY( diff --git a/hello_wolf/capture_range_bearing.h b/hello_wolf/capture_range_bearing.h index 5a7e5a771..49af84cad 100644 --- a/hello_wolf/capture_range_bearing.h +++ b/hello_wolf/capture_range_bearing.h @@ -8,7 +8,7 @@ #ifndef HELLO_WOLF_CAPTURE_RANGE_BEARING_H_ #define HELLO_WOLF_CAPTURE_RANGE_BEARING_H_ -#include "base/capture/capture_base.h" +#include "core/capture/capture_base.h" namespace wolf { diff --git a/hello_wolf/factor_bearing.h b/hello_wolf/factor_bearing.h index 5c958ba17..56857fe0a 100644 --- a/hello_wolf/factor_bearing.h +++ b/hello_wolf/factor_bearing.h @@ -8,7 +8,7 @@ #ifndef HELLO_WOLF_FACTOR_BEARING_H_ #define HELLO_WOLF_FACTOR_BEARING_H_ -#include "base/factor/factor_autodiff.h" +#include "core/factor/factor_autodiff.h" namespace wolf { diff --git a/hello_wolf/factor_range_bearing.h b/hello_wolf/factor_range_bearing.h index 1414d61a2..c4a321bad 100644 --- a/hello_wolf/factor_range_bearing.h +++ b/hello_wolf/factor_range_bearing.h @@ -8,7 +8,7 @@ #ifndef HELLO_WOLF_FACTOR_RANGE_BEARING_H_ #define HELLO_WOLF_FACTOR_RANGE_BEARING_H_ -#include "base/factor/factor_autodiff.h" +#include "core/factor/factor_autodiff.h" namespace wolf { diff --git a/hello_wolf/feature_range_bearing.h b/hello_wolf/feature_range_bearing.h index 9da7215a5..b68419434 100644 --- a/hello_wolf/feature_range_bearing.h +++ b/hello_wolf/feature_range_bearing.h @@ -8,7 +8,7 @@ #ifndef HELLO_WOLF_FEATURE_RANGE_BEARING_H_ #define HELLO_WOLF_FEATURE_RANGE_BEARING_H_ -#include "base/feature/feature_base.h" +#include "core/feature/feature_base.h" namespace wolf { diff --git a/hello_wolf/hello_wolf.cpp b/hello_wolf/hello_wolf.cpp index 3708f51d3..feeb6ac12 100644 --- a/hello_wolf/hello_wolf.cpp +++ b/hello_wolf/hello_wolf.cpp @@ -12,10 +12,10 @@ * \author: jsola */ -#include "base/common/wolf.h" +#include "core/common/wolf.h" -#include "base/sensor/sensor_odom_2D.h" -#include "base/processor/processor_odom_2D.h" +#include "core/sensor/sensor_odom_2D.h" +#include "core/processor/processor_odom_2D.h" #include "sensor_range_bearing.h" #include "processor_range_bearing.h" #include "capture_range_bearing.h" @@ -23,7 +23,7 @@ #include "factor_range_bearing.h" #include "landmark_point_2D.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/ceres_wrapper/ceres_manager.h" int main() { diff --git a/hello_wolf/landmark_point_2D.h b/hello_wolf/landmark_point_2D.h index 1bd845763..0d7fe13a0 100644 --- a/hello_wolf/landmark_point_2D.h +++ b/hello_wolf/landmark_point_2D.h @@ -8,7 +8,7 @@ #ifndef HELLO_WOLF_LANDMARK_POINT_2D_H_ #define HELLO_WOLF_LANDMARK_POINT_2D_H_ -#include "base/landmark/landmark_base.h" +#include "core/landmark/landmark_base.h" namespace wolf { diff --git a/hello_wolf/processor_range_bearing.cpp b/hello_wolf/processor_range_bearing.cpp index 25d7fd406..f12702ba9 100644 --- a/hello_wolf/processor_range_bearing.cpp +++ b/hello_wolf/processor_range_bearing.cpp @@ -162,7 +162,7 @@ Eigen::Vector2s ProcessorRangeBearing::rect(Scalar range, Scalar bearing) const } /* namespace wolf */ // Register in the SensorFactory -#include "base/processor/processor_factory.h" +#include "core/processor/processor_factory.h" namespace wolf { WOLF_REGISTER_PROCESSOR("RANGE BEARING", ProcessorRangeBearing) diff --git a/hello_wolf/processor_range_bearing.h b/hello_wolf/processor_range_bearing.h index 6e8c77cd6..0dd2b7951 100644 --- a/hello_wolf/processor_range_bearing.h +++ b/hello_wolf/processor_range_bearing.h @@ -8,7 +8,7 @@ #ifndef HELLO_WOLF_PROCESSOR_RANGE_BEARING_H_ #define HELLO_WOLF_PROCESSOR_RANGE_BEARING_H_ -#include "base/processor/processor_base.h" +#include "core/processor/processor_base.h" #include "sensor_range_bearing.h" #include "Eigen/Geometry" diff --git a/hello_wolf/sensor_range_bearing.cpp b/hello_wolf/sensor_range_bearing.cpp index 04d704664..dcdd23f1a 100644 --- a/hello_wolf/sensor_range_bearing.cpp +++ b/hello_wolf/sensor_range_bearing.cpp @@ -6,7 +6,7 @@ */ #include "sensor_range_bearing.h" -#include "base/state_angle.h" +#include "core/state_angle.h" namespace wolf { @@ -45,7 +45,7 @@ SensorBasePtr SensorRangeBearing::create(const std::string& _unique_name, // } /* namespace wolf */ // Register in the SensorFactory -#include "base/sensor/sensor_factory.h" +#include "core/sensor/sensor_factory.h" namespace wolf { WOLF_REGISTER_SENSOR("RANGE BEARING", SensorRangeBearing) diff --git a/hello_wolf/sensor_range_bearing.h b/hello_wolf/sensor_range_bearing.h index 01ac8d93e..5b60f0bb2 100644 --- a/hello_wolf/sensor_range_bearing.h +++ b/hello_wolf/sensor_range_bearing.h @@ -8,7 +8,7 @@ #ifndef HELLO_WOLF_SENSOR_RANGE_BEARING_H_ #define HELLO_WOLF_SENSOR_RANGE_BEARING_H_ -#include "base/sensor/sensor_base.h" +#include "core/sensor/sensor_base.h" namespace wolf { diff --git a/include/gnss/capture/capture_gnss_fix.h b/include/gnss/capture/capture_gnss_fix.h index 2a00973a2..08af47ba2 100644 --- a/include/gnss/capture/capture_gnss_fix.h +++ b/include/gnss/capture/capture_gnss_fix.h @@ -3,7 +3,7 @@ //Wolf includes #include "gnss/feature/feature_gnss_fix.h" -#include "base/capture/capture_base.h" +#include "core/capture/capture_base.h" //std includes // diff --git a/include/gnss/capture/capture_gnss_single_diff.h b/include/gnss/capture/capture_gnss_single_diff.h index b8c080fb0..3423496bd 100644 --- a/include/gnss/capture/capture_gnss_single_diff.h +++ b/include/gnss/capture/capture_gnss_single_diff.h @@ -3,7 +3,7 @@ //Wolf includes #include "gnss/feature/feature_gnss_single_diff.h" -#include "base/capture/capture_base.h" +#include "core/capture/capture_base.h" //std includes // diff --git a/include/gnss/factor/factor_gnss_fix_2D.h b/include/gnss/factor/factor_gnss_fix_2D.h index 3bdaf6fa6..0a1e49c45 100644 --- a/include/gnss/factor/factor_gnss_fix_2D.h +++ b/include/gnss/factor/factor_gnss_fix_2D.h @@ -3,9 +3,9 @@ #define FACTOR_GNSS_FIX_2D_H_ //Wolf includes -#include "base/common/wolf.h" -#include "base/factor/factor_autodiff.h" -#include "base/frame/frame_base.h" +#include "core/common/wolf.h" +#include "core/factor/factor_autodiff.h" +#include "core/frame/frame_base.h" #include "gnss/sensor/sensor_gnss.h" namespace wolf { diff --git a/include/gnss/factor/factor_gnss_fix_3D.h b/include/gnss/factor/factor_gnss_fix_3D.h index 713ec5e26..89628d4c8 100644 --- a/include/gnss/factor/factor_gnss_fix_3D.h +++ b/include/gnss/factor/factor_gnss_fix_3D.h @@ -3,9 +3,9 @@ #define FACTOR_GNSS_FIX_3D_H_ //Wolf includes -#include "base/common/wolf.h" -#include "base/factor/factor_autodiff.h" -#include "base/frame/frame_base.h" +#include "core/common/wolf.h" +#include "core/factor/factor_autodiff.h" +#include "core/frame/frame_base.h" namespace wolf { diff --git a/include/gnss/factor/factor_gnss_single_diff_2D.h b/include/gnss/factor/factor_gnss_single_diff_2D.h index ed53f0073..1d52171a4 100644 --- a/include/gnss/factor/factor_gnss_single_diff_2D.h +++ b/include/gnss/factor/factor_gnss_single_diff_2D.h @@ -3,9 +3,9 @@ #define FACTOR_GNSS_SINGLE_DIFF_2D_H_ //Wolf includes -#include "base/common/wolf.h" -#include "base/factor/factor_autodiff.h" -#include "base/frame/frame_base.h" +#include "core/common/wolf.h" +#include "core/factor/factor_autodiff.h" +#include "core/frame/frame_base.h" #include "gnss/sensor/sensor_gnss.h" namespace wolf { diff --git a/include/gnss/feature/feature_gnss_fix.h b/include/gnss/feature/feature_gnss_fix.h index 2f7e8cd99..0184490f9 100644 --- a/include/gnss/feature/feature_gnss_fix.h +++ b/include/gnss/feature/feature_gnss_fix.h @@ -2,7 +2,7 @@ #define FEATURE_GNSS_FIX_H_ //Wolf includes -#include "base/feature/feature_base.h" +#include "core/feature/feature_base.h" //std includes diff --git a/include/gnss/feature/feature_gnss_single_diff.h b/include/gnss/feature/feature_gnss_single_diff.h index f21c634b8..903a062ce 100644 --- a/include/gnss/feature/feature_gnss_single_diff.h +++ b/include/gnss/feature/feature_gnss_single_diff.h @@ -2,7 +2,7 @@ #define FEATURE_GNSS_SINGLE_DIFF_H_ //Wolf includes -#include "base/feature/feature_base.h" +#include "core/feature/feature_base.h" //std includes diff --git a/include/gnss/processor/processor_gnss_fix.h b/include/gnss/processor/processor_gnss_fix.h index eafeed0ce..28d029831 100644 --- a/include/gnss/processor/processor_gnss_fix.h +++ b/include/gnss/processor/processor_gnss_fix.h @@ -2,7 +2,7 @@ #define WOLF_PROCESSOR_GNSS_FIX_H // Wolf includes -#include "base/processor/processor_base.h" +#include "core/processor/processor_base.h" #include "gnss/capture/capture_gnss_fix.h" // Std includes diff --git a/include/gnss/processor/processor_gnss_single_diff.h b/include/gnss/processor/processor_gnss_single_diff.h index 3f7a6702f..ef1cdeb50 100644 --- a/include/gnss/processor/processor_gnss_single_diff.h +++ b/include/gnss/processor/processor_gnss_single_diff.h @@ -2,7 +2,7 @@ #define WOLF_PROCESSOR_GNSS_SINGLE_DIFF_H // Wolf includes -#include "base/processor/processor_base.h" +#include "core/processor/processor_base.h" #include "gnss/capture/capture_gnss_single_diff.h" // Std includes diff --git a/include/gnss/sensor/sensor_gnss.h b/include/gnss/sensor/sensor_gnss.h index fe006440d..c7a147dc1 100644 --- a/include/gnss/sensor/sensor_gnss.h +++ b/include/gnss/sensor/sensor_gnss.h @@ -2,7 +2,7 @@ #define SENSOR_GPS_H_ //wolf -#include "base/sensor/sensor_base.h" +#include "core/sensor/sensor_base.h" // std diff --git a/serialization/cereal/serialization_local_parametrization_base.h b/serialization/cereal/serialization_local_parametrization_base.h index 0c38a5a61..a398efa6f 100644 --- a/serialization/cereal/serialization_local_parametrization_base.h +++ b/serialization/cereal/serialization_local_parametrization_base.h @@ -1,7 +1,7 @@ #ifndef _WOLF_IO_CEREAL_LOCAL_PARAMETRIZATION_BASE_H_ #define _WOLF_IO_CEREAL_LOCAL_PARAMETRIZATION_BASE_H_ -#include "base/local_parametrization_base.h" +#include "core/local_parametrization_base.h" #include <cereal/cereal.hpp> #include <cereal/types/polymorphic.hpp> diff --git a/serialization/cereal/serialization_local_parametrization_homogeneous.h b/serialization/cereal/serialization_local_parametrization_homogeneous.h index 2b36232d5..9fcc656d5 100644 --- a/serialization/cereal/serialization_local_parametrization_homogeneous.h +++ b/serialization/cereal/serialization_local_parametrization_homogeneous.h @@ -1,7 +1,7 @@ #ifndef _WOLF_IO_CEREAL_LOCAL_PARAMETRIZATION_BASE_HOMOGENEOUS_H_ #define _WOLF_IO_CEREAL_LOCAL_PARAMETRIZATION_BASE_HOMOGENEOUS_H_ -#include "base/local_parametrization_homogeneous.h" +#include "core/local_parametrization_homogeneous.h" #include "serialization_local_parametrization_base.h" diff --git a/serialization/cereal/serialization_local_parametrization_quaternion.h b/serialization/cereal/serialization_local_parametrization_quaternion.h index 95c71f4c2..66fe30a36 100644 --- a/serialization/cereal/serialization_local_parametrization_quaternion.h +++ b/serialization/cereal/serialization_local_parametrization_quaternion.h @@ -1,7 +1,7 @@ #ifndef WOLF_IO_SERIALIZATION_LOCAL_PARAMETRIZATION_QUATERNION_H_ #define WOLF_IO_SERIALIZATION_LOCAL_PARAMETRIZATION_QUATERNION_H_ -#include "base/local_parametrization_quaternion.h" +#include "core/local_parametrization_quaternion.h" #include "serialization_local_parametrization_base.h" diff --git a/serialization/cereal/serialization_node_base.h b/serialization/cereal/serialization_node_base.h index 5a0a039a3..a2c592d69 100644 --- a/serialization/cereal/serialization_node_base.h +++ b/serialization/cereal/serialization_node_base.h @@ -2,7 +2,7 @@ #define _WOLF_IO_CEREAL_NODE_BASE_H_ // Wolf includes -#include "base/node_base.h" +#include "core/node_base.h" #include <cereal/cereal.hpp> #include <cereal/types/polymorphic.hpp> diff --git a/serialization/cereal/serialization_processor_odom2d_params.h b/serialization/cereal/serialization_processor_odom2d_params.h index 2056f6de9..dc0416b94 100644 --- a/serialization/cereal/serialization_processor_odom2d_params.h +++ b/serialization/cereal/serialization_processor_odom2d_params.h @@ -2,7 +2,7 @@ #define _WOLF_SERIALIZATION_CEREAL_PROCESSOR_ODOM2D_PARAMS_H_ // Wolf includes -#include "base/processor/processor_odom_2D.h" +#include "core/processor/processor_odom_2D.h" #include "serialization_processor_params_base.h" namespace cereal { diff --git a/serialization/cereal/serialization_processor_odom3d_params.h b/serialization/cereal/serialization_processor_odom3d_params.h index 1556a39e4..d2fd7c077 100644 --- a/serialization/cereal/serialization_processor_odom3d_params.h +++ b/serialization/cereal/serialization_processor_odom3d_params.h @@ -2,7 +2,7 @@ #define _WOLF_SERIALIZATION_CEREAL_PROCESSOR_ODOM3D_PARAMS_H_ // Wolf includes -#include "base/processor/processor_odom_3D.h" +#include "core/processor/processor_odom_3D.h" #include "serialization_processor_params_base.h" namespace cereal { diff --git a/serialization/cereal/serialization_processor_params_base.h b/serialization/cereal/serialization_processor_params_base.h index 2c75b85c9..03ea158c0 100644 --- a/serialization/cereal/serialization_processor_params_base.h +++ b/serialization/cereal/serialization_processor_params_base.h @@ -2,7 +2,7 @@ #define _WOLF_SERIALIZATION_CEREAL_PROCESSOR_PARAM_BASE_H_ // Wolf includes -#include "base/processor/processor_base.h" +#include "core/processor/processor_base.h" #include <cereal/cereal.hpp> #include <cereal/types/polymorphic.hpp> diff --git a/serialization/cereal/serialization_sensor_intrinsic_base.h b/serialization/cereal/serialization_sensor_intrinsic_base.h index 3e3b1cdb4..86b2a9b48 100644 --- a/serialization/cereal/serialization_sensor_intrinsic_base.h +++ b/serialization/cereal/serialization_sensor_intrinsic_base.h @@ -2,7 +2,7 @@ #define _WOLF_SERIALIZATION_CEREAL_SENSOR_INTRINSIC_BASE_H_ // Wolf includes -#include "base/sensor/sensor_base.h" +#include "core/sensor/sensor_base.h" #include <cereal/cereal.hpp> #include <cereal/types/polymorphic.hpp> diff --git a/serialization/cereal/serialization_sensor_odom2d_intrinsic.h b/serialization/cereal/serialization_sensor_odom2d_intrinsic.h index ccfe569a7..17d4160b3 100644 --- a/serialization/cereal/serialization_sensor_odom2d_intrinsic.h +++ b/serialization/cereal/serialization_sensor_odom2d_intrinsic.h @@ -2,7 +2,7 @@ #define _WOLF_SERIALIZATION_CEREAL_SENSOR_ODOM2D_INTRINSIC_H_ // Wolf includes -#include "base/sensor/sensor_odom_2D.h" +#include "core/sensor/sensor_odom_2D.h" #include "serialization_sensor_intrinsic_base.h" diff --git a/serialization/cereal/serialization_time_stamp.h b/serialization/cereal/serialization_time_stamp.h index 6cc9e29c7..f0c978d36 100644 --- a/serialization/cereal/serialization_time_stamp.h +++ b/serialization/cereal/serialization_time_stamp.h @@ -2,7 +2,7 @@ #define _WOLF_IO_CEREAL_TIME_STAMP_H_ // Wolf includes -#include "base/time_stamp.h" +#include "core/time_stamp.h" #include <cereal/cereal.hpp> diff --git a/src/examples/solver/test_ccolamd.cpp b/src/examples/solver/test_ccolamd.cpp index d9eec5b00..48831f651 100644 --- a/src/examples/solver/test_ccolamd.cpp +++ b/src/examples/solver/test_ccolamd.cpp @@ -6,7 +6,7 @@ */ // Wolf includes -#include "base/common/wolf.h" +#include "core/common/wolf.h" //std includes #include <cstdlib> diff --git a/src/examples/solver/test_iQR_wolf2.cpp b/src/examples/solver/test_iQR_wolf2.cpp index dc4094304..9ad57098e 100644 --- a/src/examples/solver/test_iQR_wolf2.cpp +++ b/src/examples/solver/test_iQR_wolf2.cpp @@ -17,9 +17,9 @@ #include <queue> //Wolf includes -#include "base/state_block/state_block.h" -#include "base/factor/factor_base.h" -#include "base/sensor/sensor_laser_2D.h" +#include "core/state_block/state_block.h" +#include "core/factor/factor_base.h" +#include "core/sensor/sensor_laser_2D.h" #include "wolf_manager.h" // wolf solver @@ -35,7 +35,7 @@ //Ceres includes #include "glog/logging.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/ceres_wrapper/ceres_manager.h" //laser_scan_utils #include "iri-algorithms/laser_scan_utils/corner_detector.h" diff --git a/src/examples/test_2_lasers_offline.cpp b/src/examples/test_2_lasers_offline.cpp index 9174dc94f..58e91c6d8 100644 --- a/src/examples/test_2_lasers_offline.cpp +++ b/src/examples/test_2_lasers_offline.cpp @@ -1,5 +1,5 @@ //std includes -#include "base/sensor/sensor_GPS_fix.h" +#include "core/sensor/sensor_GPS_fix.h" #include <cstdlib> #include <iostream> #include <fstream> @@ -17,12 +17,12 @@ #include "glog/logging.h" //Wolf includes -#include "base/problem/problem.h" -#include "base/processor/processor_tracker_landmark_corner.h" -#include "base/processor/processor_odom_2D.h" -#include "base/sensor/sensor_laser_2D.h" -#include "base/sensor/sensor_odom_2D.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/problem/problem.h" +#include "core/processor/processor_tracker_landmark_corner.h" +#include "core/processor/processor_odom_2D.h" +#include "core/sensor/sensor_laser_2D.h" +#include "core/sensor/sensor_odom_2D.h" +#include "core/ceres_wrapper/ceres_manager.h" // laserscanutils #include "laser_scan_utils/line_finder_iterative.h" @@ -31,7 +31,7 @@ //C includes for sleep, time and main args #include "unistd.h" -#include "base/capture/capture_pose.h" +#include "core/capture/capture_pose.h" //faramotics includes #include "faramotics/dynamicSceneRender.h" #include "faramotics/rangeScan2D.h" diff --git a/src/examples/test_analytic_odom_factor.cpp b/src/examples/test_analytic_odom_factor.cpp index 344c284e2..32a2cbc64 100644 --- a/src/examples/test_analytic_odom_factor.cpp +++ b/src/examples/test_analytic_odom_factor.cpp @@ -12,8 +12,8 @@ //Wolf includes #include "wolf_manager.h" -#include "base/capture/capture_void.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/capture/capture_void.h" +#include "core/ceres_wrapper/ceres_manager.h" // EIGEN //#include <Eigen/CholmodSupport> diff --git a/src/examples/test_autodiff.cpp b/src/examples/test_autodiff.cpp index a4c75ccde..6fa1e01ed 100644 --- a/src/examples/test_autodiff.cpp +++ b/src/examples/test_autodiff.cpp @@ -17,8 +17,8 @@ //Wolf includes #include "wolf_manager.h" -#include "base/sensor/sensor_laser_2D.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/sensor/sensor_laser_2D.h" +#include "core/ceres_wrapper/ceres_manager.h" //C includes for sleep, time and main args #include "unistd.h" diff --git a/src/examples/test_capture_laser_2D.cpp b/src/examples/test_capture_laser_2D.cpp index 8ca0e376b..cd5e40239 100644 --- a/src/examples/test_capture_laser_2D.cpp +++ b/src/examples/test_capture_laser_2D.cpp @@ -3,7 +3,7 @@ #include <random> //wolf -#include "base/capture/capture_laser_2D.h" +#include "core/capture/capture_laser_2D.h" // Eigen in std vector #include <Eigen/StdVector> diff --git a/src/examples/test_ceres_2_lasers.cpp b/src/examples/test_ceres_2_lasers.cpp index d12f491de..b090a8a5a 100644 --- a/src/examples/test_ceres_2_lasers.cpp +++ b/src/examples/test_ceres_2_lasers.cpp @@ -1,5 +1,5 @@ //std includes -#include "base/sensor/sensor_GPS_fix.h" +#include "core/sensor/sensor_GPS_fix.h" #include <cstdlib> #include <iostream> #include <fstream> @@ -17,12 +17,12 @@ #include "glog/logging.h" //Wolf includes -#include "base/problem/problem.h" -#include "base/processor/processor_tracker_landmark_corner.h" -#include "base/processor/processor_odom_2D.h" -#include "base/sensor/sensor_laser_2D.h" -#include "base/sensor/sensor_odom_2D.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/problem/problem.h" +#include "core/processor/processor_tracker_landmark_corner.h" +#include "core/processor/processor_odom_2D.h" +#include "core/sensor/sensor_laser_2D.h" +#include "core/sensor/sensor_odom_2D.h" +#include "core/ceres_wrapper/ceres_manager.h" // laserscanutils #include "laser_scan_utils/line_finder_iterative.h" @@ -31,7 +31,7 @@ //C includes for sleep, time and main args #include "unistd.h" -#include "base/capture/capture_pose.h" +#include "core/capture/capture_pose.h" //faramotics includes #include "faramotics/dynamicSceneRender.h" #include "faramotics/rangeScan2D.h" diff --git a/src/examples/test_ceres_2_lasers_polylines.cpp b/src/examples/test_ceres_2_lasers_polylines.cpp index 136ba285e..7e83dec25 100644 --- a/src/examples/test_ceres_2_lasers_polylines.cpp +++ b/src/examples/test_ceres_2_lasers_polylines.cpp @@ -1,5 +1,5 @@ //std includes -#include "base/sensor/sensor_GPS_fix.h" +#include "core/sensor/sensor_GPS_fix.h" #include <cstdlib> #include <iostream> #include <fstream> @@ -17,12 +17,12 @@ #include "glog/logging.h" //Wolf includes -#include "base/problem/problem.h" -#include "base/processor/processor_tracker_landmark_polyline.h" -#include "base/processor/processor_odom_2D.h" -#include "base/sensor/sensor_laser_2D.h" -#include "base/sensor/sensor_odom_2D.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/problem/problem.h" +#include "core/processor/processor_tracker_landmark_polyline.h" +#include "core/processor/processor_odom_2D.h" +#include "core/sensor/sensor_laser_2D.h" +#include "core/sensor/sensor_odom_2D.h" +#include "core/ceres_wrapper/ceres_manager.h" // laserscanutils #include "laser_scan_utils/line_finder_iterative.h" @@ -31,7 +31,7 @@ //C includes for sleep, time and main args #include "unistd.h" -#include "base/capture/capture_pose.h" +#include "core/capture/capture_pose.h" //faramotics includes #include "faramotics/dynamicSceneRender.h" #include "faramotics/rangeScan2D.h" diff --git a/src/examples/test_diff_drive.cpp b/src/examples/test_diff_drive.cpp index 23980071f..21c2a8b94 100644 --- a/src/examples/test_diff_drive.cpp +++ b/src/examples/test_diff_drive.cpp @@ -6,11 +6,11 @@ */ //Wolf -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/sensor/sensor_diff_drive.h" -#include "base/capture/capture_wheel_joint_position.h" -#include "base/processor/processor_diff_drive.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/sensor/sensor_diff_drive.h" +#include "core/capture/capture_wheel_joint_position.h" +#include "core/processor/processor_diff_drive.h" //std #include <iostream> diff --git a/src/examples/test_eigen_quaternion.cpp b/src/examples/test_eigen_quaternion.cpp index d24a715cb..1e85039d7 100644 --- a/src/examples/test_eigen_quaternion.cpp +++ b/src/examples/test_eigen_quaternion.cpp @@ -6,7 +6,7 @@ #include <eigen3/Eigen/Geometry> //Wolf -#include "base/common/wolf.h" +#include "core/common/wolf.h" int main() { diff --git a/src/examples/test_factor_AHP.cpp b/src/examples/test_factor_AHP.cpp index 2c92e39d1..03d7791ab 100644 --- a/src/examples/test_factor_AHP.cpp +++ b/src/examples/test_factor_AHP.cpp @@ -1,10 +1,10 @@ -#include "base/pinhole_tools.h" -#include "base/landmark/landmark_AHP.h" -#include "base/factor/factor_AHP.h" -#include "base/state_block/state_block.h" -#include "base/state_block/state_quaternion.h" -#include "base/sensor/sensor_camera.h" -#include "base/capture/capture_image.h" +#include "core/pinhole_tools.h" +#include "core/landmark/landmark_AHP.h" +#include "core/factor/factor_AHP.h" +#include "core/state_block/state_block.h" +#include "core/state_block/state_quaternion.h" +#include "core/sensor/sensor_camera.h" +#include "core/capture/capture_image.h" int main() { diff --git a/src/examples/test_factor_imu.cpp b/src/examples/test_factor_imu.cpp index 3d0483e96..9d7d73379 100644 --- a/src/examples/test_factor_imu.cpp +++ b/src/examples/test_factor_imu.cpp @@ -1,14 +1,14 @@ //Wolf -#include "base/capture/capture_IMU.h" -#include "base/processor/processor_IMU.h" -#include "base/sensor/sensor_IMU.h" -#include "base/capture/capture_pose.h" -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/factor/factor_odom_3D.h" -#include "base/state_block/state_block.h" -#include "base/state_block/state_quaternion.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/capture/capture_IMU.h" +#include "core/processor/processor_IMU.h" +#include "core/sensor/sensor_IMU.h" +#include "core/capture/capture_pose.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/factor/factor_odom_3D.h" +#include "core/state_block/state_block.h" +#include "core/state_block/state_quaternion.h" +#include "core/ceres_wrapper/ceres_manager.h" //#define DEBUG_RESULTS diff --git a/src/examples/test_factor_odom_3D.cpp b/src/examples/test_factor_odom_3D.cpp index 77fa4c802..be7a81c4f 100644 --- a/src/examples/test_factor_odom_3D.cpp +++ b/src/examples/test_factor_odom_3D.cpp @@ -5,7 +5,7 @@ * Author: jsola */ -#include "base/factor/factor_odom_3D.h" +#include "core/factor/factor_odom_3D.h" namespace wolf { diff --git a/src/examples/test_faramotics_simulation.cpp b/src/examples/test_faramotics_simulation.cpp index e095e561d..4414520dc 100644 --- a/src/examples/test_faramotics_simulation.cpp +++ b/src/examples/test_faramotics_simulation.cpp @@ -16,10 +16,10 @@ #include "unistd.h" // wolf -#include "base/common/wolf.h" -#include "base/feature/feature_base.h" -#include "base/landmark/landmark_base.h" -#include "base/state_block/state_block.h" +#include "core/common/wolf.h" +#include "core/feature/feature_base.h" +#include "core/landmark/landmark_base.h" +#include "core/state_block/state_block.h" //faramotics includes #include "faramotics/dynamicSceneRender.h" diff --git a/src/examples/test_image.cpp b/src/examples/test_image.cpp index b2b61f520..842a6a14b 100644 --- a/src/examples/test_image.cpp +++ b/src/examples/test_image.cpp @@ -1,10 +1,10 @@ // Testing things for the 3D image odometry //Wolf includes -#include "base/sensor/sensor_camera.h" -#include "base/capture/capture_image.h" -#include "base/processor/processor_tracker_feature_image.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/sensor/sensor_camera.h" +#include "core/capture/capture_image.h" +#include "core/processor/processor_tracker_feature_image.h" +#include "core/ceres_wrapper/ceres_manager.h" // Vision utils includes #include <vision_utils.h> diff --git a/src/examples/test_imuDock.cpp b/src/examples/test_imuDock.cpp index dab6894d7..c05fbbf9c 100644 --- a/src/examples/test_imuDock.cpp +++ b/src/examples/test_imuDock.cpp @@ -5,21 +5,21 @@ * \author: Dinesh Atchuthan */ -#include "base/processor/processor_IMU.h" -#include "base/sensor/sensor_IMU.h" -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/ceres_wrapper/ceres_manager.h" -#include "base/sensor/sensor_odom_3D.h" -#include "base/processor/processor_odom_3D.h" +#include "core/processor/processor_IMU.h" +#include "core/sensor/sensor_IMU.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/ceres_wrapper/ceres_manager.h" +#include "core/sensor/sensor_odom_3D.h" +#include "core/processor/processor_odom_3D.h" //Factors headers -#include "base/factor/factor_fix_bias.h" +#include "core/factor/factor_fix_bias.h" //std #include <iostream> #include <fstream> -#include "base/factor/factor_pose_3D.h" +#include "core/factor/factor_pose_3D.h" #define OUTPUT_RESULTS //#define ADD_KF3 diff --git a/src/examples/test_imuDock_autoKFs.cpp b/src/examples/test_imuDock_autoKFs.cpp index 43a54d654..039615445 100644 --- a/src/examples/test_imuDock_autoKFs.cpp +++ b/src/examples/test_imuDock_autoKFs.cpp @@ -5,21 +5,21 @@ * \author: Dinesh Atchuthan */ -#include "base/processor/processor_IMU.h" -#include "base/sensor/sensor_IMU.h" -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/ceres_wrapper/ceres_manager.h" -#include "base/sensor/sensor_odom_3D.h" -#include "base/processor/processor_odom_3D.h" +#include "core/processor/processor_IMU.h" +#include "core/sensor/sensor_IMU.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/ceres_wrapper/ceres_manager.h" +#include "core/sensor/sensor_odom_3D.h" +#include "core/processor/processor_odom_3D.h" //Factors headers -#include "base/factor/factor_fix_bias.h" +#include "core/factor/factor_fix_bias.h" //std #include <iostream> #include <fstream> -#include "base/factor/factor_pose_3D.h" +#include "core/factor/factor_pose_3D.h" #define OUTPUT_RESULTS //#define AUTO_KFS diff --git a/src/examples/test_imuPlateform_Offline.cpp b/src/examples/test_imuPlateform_Offline.cpp index 4b923de89..e0e4e4778 100644 --- a/src/examples/test_imuPlateform_Offline.cpp +++ b/src/examples/test_imuPlateform_Offline.cpp @@ -1,15 +1,15 @@ //Wolf -#include "base/capture/capture_IMU.h" -#include "base/processor/processor_IMU.h" -#include "base/sensor/sensor_IMU.h" -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/sensor/sensor_odom_3D.h" -#include "base/factor/factor_odom_3D.h" -#include "base/state_block/state_block.h" -#include "base/state_block/state_quaternion.h" -#include "base/processor/processor_odom_3D.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/capture/capture_IMU.h" +#include "core/processor/processor_IMU.h" +#include "core/sensor/sensor_IMU.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/sensor/sensor_odom_3D.h" +#include "core/factor/factor_odom_3D.h" +#include "core/state_block/state_block.h" +#include "core/state_block/state_quaternion.h" +#include "core/processor/processor_odom_3D.h" +#include "core/ceres_wrapper/ceres_manager.h" //std #include <iostream> diff --git a/src/examples/test_imu_constrained0.cpp b/src/examples/test_imu_constrained0.cpp index e542e18e0..817b08a14 100644 --- a/src/examples/test_imu_constrained0.cpp +++ b/src/examples/test_imu_constrained0.cpp @@ -1,15 +1,15 @@ //Wolf -#include "base/capture/capture_IMU.h" -#include "base/processor/processor_IMU.h" -#include "base/sensor/sensor_IMU.h" -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/sensor/sensor_odom_3D.h" -#include "base/factor/factor_odom_3D.h" -#include "base/state_block/state_block.h" -#include "base/state_block/state_quaternion.h" -#include "base/processor/processor_odom_3D.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/capture/capture_IMU.h" +#include "core/processor/processor_IMU.h" +#include "core/sensor/sensor_IMU.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/sensor/sensor_odom_3D.h" +#include "core/factor/factor_odom_3D.h" +#include "core/state_block/state_block.h" +#include "core/state_block/state_quaternion.h" +#include "core/processor/processor_odom_3D.h" +#include "core/ceres_wrapper/ceres_manager.h" //std #include <iostream> diff --git a/src/examples/test_kf_callback.cpp b/src/examples/test_kf_callback.cpp index 05bd16597..ea1079d75 100644 --- a/src/examples/test_kf_callback.cpp +++ b/src/examples/test_kf_callback.cpp @@ -5,10 +5,10 @@ * Author: jsola */ -#include "base/sensor/sensor_odom_2D.h" -#include "base/processor/processor_odom_2D.h" -#include "base/processor/processor_tracker_feature_dummy.h" -#include "base/capture/capture_void.h" +#include "core/sensor/sensor_odom_2D.h" +#include "core/processor/processor_odom_2D.h" +#include "core/processor/processor_tracker_feature_dummy.h" +#include "core/capture/capture_void.h" int main() { diff --git a/src/examples/test_map_yaml.cpp b/src/examples/test_map_yaml.cpp index aa74ae9e2..070300d90 100644 --- a/src/examples/test_map_yaml.cpp +++ b/src/examples/test_map_yaml.cpp @@ -5,13 +5,13 @@ * \author: jsola */ -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/map_base.h" -#include "base/landmark/landmark_polyline_2D.h" -#include "base/landmark/landmark_AHP.h" -#include "base/state_block/state_block.h" -#include "base/yaml/yaml_conversion.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/map_base.h" +#include "core/landmark/landmark_polyline_2D.h" +#include "core/landmark/landmark_AHP.h" +#include "core/state_block/state_block.h" +#include "core/yaml/yaml_conversion.h" #include <iostream> using namespace wolf; diff --git a/src/examples/test_mpu.cpp b/src/examples/test_mpu.cpp index 1fbed214f..f2d5bbade 100644 --- a/src/examples/test_mpu.cpp +++ b/src/examples/test_mpu.cpp @@ -6,11 +6,11 @@ */ //Wolf -#include "base/capture/capture_IMU.h" -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/state_block/state_block.h" -#include "base/state_block/state_quaternion.h" +#include "core/capture/capture_IMU.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/state_block/state_block.h" +#include "core/state_block/state_quaternion.h" #include <iostream> #include <fstream> #include <iomanip> @@ -18,8 +18,8 @@ #include <cmath> #include <termios.h> #include <fcntl.h> -#include "base/processor/processor_IMU.h" -#include "base/sensor/sensor_IMU.h" +#include "core/processor/processor_IMU.h" +#include "core/sensor/sensor_IMU.h" #define DEBUG_RESULTS #define FROM_FILE diff --git a/src/examples/test_processor_imu.cpp b/src/examples/test_processor_imu.cpp index 33ec4cabb..ec77aedee 100644 --- a/src/examples/test_processor_imu.cpp +++ b/src/examples/test_processor_imu.cpp @@ -6,13 +6,13 @@ */ //Wolf -#include "base/capture/capture_IMU.h" -#include "base/processor/processor_IMU.h" -#include "base/sensor/sensor_IMU.h" -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/state_block/state_block.h" -#include "base/state_block/state_quaternion.h" +#include "core/capture/capture_IMU.h" +#include "core/processor/processor_IMU.h" +#include "core/sensor/sensor_IMU.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/state_block/state_block.h" +#include "core/state_block/state_quaternion.h" #include <iostream> #include <fstream> #include <iomanip> diff --git a/src/examples/test_processor_imu_jacobians.cpp b/src/examples/test_processor_imu_jacobians.cpp index 22c797d6d..988244d15 100644 --- a/src/examples/test_processor_imu_jacobians.cpp +++ b/src/examples/test_processor_imu_jacobians.cpp @@ -6,13 +6,13 @@ */ //Wolf -#include "base/capture/capture_IMU.h" -#include "base/sensor/sensor_IMU.h" +#include "core/capture/capture_IMU.h" +#include "core/sensor/sensor_IMU.h" #include <test/processor_IMU_UnitTester.h> -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/state_block/state_block.h" -#include "base/state_block/state_quaternion.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/state_block/state_block.h" +#include "core/state_block/state_quaternion.h" #include <iostream> #include <fstream> #include <iomanip> diff --git a/src/examples/test_processor_odom_3D.cpp b/src/examples/test_processor_odom_3D.cpp index 3c5bc0afe..1be371650 100644 --- a/src/examples/test_processor_odom_3D.cpp +++ b/src/examples/test_processor_odom_3D.cpp @@ -5,13 +5,13 @@ * \author: jsola */ -#include "base/capture/capture_IMU.h" -#include "base/problem/problem.h" -#include "base/sensor/sensor_odom_2D.h" -#include "base/processor/processor_odom_3D.h" -#include "base/map_base.h" -#include "base/landmark/landmark_base.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/capture/capture_IMU.h" +#include "core/problem/problem.h" +#include "core/sensor/sensor_odom_2D.h" +#include "core/processor/processor_odom_3D.h" +#include "core/map_base.h" +#include "core/landmark/landmark_base.h" +#include "core/ceres_wrapper/ceres_manager.h" #include <cstdlib> diff --git a/src/examples/test_processor_tracker_feature.cpp b/src/examples/test_processor_tracker_feature.cpp index 89a213f43..a5c2476d7 100644 --- a/src/examples/test_processor_tracker_feature.cpp +++ b/src/examples/test_processor_tracker_feature.cpp @@ -9,12 +9,12 @@ #include <iostream> //Wolf -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/sensor/sensor_base.h" -#include "base/state_block/state_block.h" -#include "base/processor/processor_tracker_feature_dummy.h" -#include "base/capture/capture_void.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/sensor/sensor_base.h" +#include "core/state_block/state_block.h" +#include "core/processor/processor_tracker_feature_dummy.h" +#include "core/capture/capture_void.h" void print_prc(wolf::ProcessorTrackerFeaturePtr _prc) { diff --git a/src/examples/test_processor_tracker_landmark.cpp b/src/examples/test_processor_tracker_landmark.cpp index 170222976..05eb1a519 100644 --- a/src/examples/test_processor_tracker_landmark.cpp +++ b/src/examples/test_processor_tracker_landmark.cpp @@ -9,12 +9,12 @@ #include <iostream> //Wolf -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/sensor/sensor_base.h" -#include "base/state_block/state_block.h" -#include "base/processor/processor_tracker_landmark_dummy.h" -#include "base/capture/capture_void.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/sensor/sensor_base.h" +#include "core/state_block/state_block.h" +#include "core/processor/processor_tracker_landmark_dummy.h" +#include "core/capture/capture_void.h" void print_problem_pointers(wolf::ProblemPtr wolf_problem_ptr_) { diff --git a/src/examples/test_processor_tracker_landmark_image.cpp b/src/examples/test_processor_tracker_landmark_image.cpp index be7df536e..f3c79633d 100644 --- a/src/examples/test_processor_tracker_landmark_image.cpp +++ b/src/examples/test_processor_tracker_landmark_image.cpp @@ -1,18 +1,18 @@ //std #include <iostream> -#include "base/processor/processor_tracker_landmark_image.h" +#include "core/processor/processor_tracker_landmark_image.h" //Wolf -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/state_block/state_block.h" -#include "base/processor/processor_odom_3D.h" -#include "base/sensor/sensor_odom_3D.h" -#include "base/sensor/sensor_camera.h" -#include "base/capture/capture_image.h" -#include "base/capture/capture_pose.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/state_block/state_block.h" +#include "core/processor/processor_odom_3D.h" +#include "core/sensor/sensor_odom_3D.h" +#include "core/sensor/sensor_camera.h" +#include "core/capture/capture_image.h" +#include "core/capture/capture_pose.h" +#include "core/ceres_wrapper/ceres_manager.h" // Vision utils includes #include <vision_utils.h> diff --git a/src/examples/test_projection_points.cpp b/src/examples/test_projection_points.cpp index c24e8904e..e643489ca 100644 --- a/src/examples/test_projection_points.cpp +++ b/src/examples/test_projection_points.cpp @@ -6,7 +6,7 @@ #include <iostream> //wolf includes -#include "base/pinhole_tools.h" +#include "core/pinhole_tools.h" int main(int argc, char** argv) { diff --git a/src/examples/test_simple_AHP.cpp b/src/examples/test_simple_AHP.cpp index dd8b88f79..b901a0a10 100644 --- a/src/examples/test_simple_AHP.cpp +++ b/src/examples/test_simple_AHP.cpp @@ -5,15 +5,15 @@ * \author: jtarraso */ -#include "base/common/wolf.h" -#include "base/frame/frame_base.h" -#include "base/pinhole_tools.h" -#include "base/sensor/sensor_camera.h" -#include "base/rotations.h" -#include "base/capture/capture_image.h" -#include "base/landmark/landmark_AHP.h" -#include "base/factor/factor_AHP.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/common/wolf.h" +#include "core/frame/frame_base.h" +#include "core/pinhole_tools.h" +#include "core/sensor/sensor_camera.h" +#include "core/rotations.h" +#include "core/capture/capture_image.h" +#include "core/landmark/landmark_AHP.h" +#include "core/factor/factor_AHP.h" +#include "core/ceres_wrapper/ceres_manager.h" // Vision utils #include <vision_utils/vision_utils.h> diff --git a/src/examples/test_sort_keyframes.cpp b/src/examples/test_sort_keyframes.cpp index c65e17c71..4edc04ea9 100644 --- a/src/examples/test_sort_keyframes.cpp +++ b/src/examples/test_sort_keyframes.cpp @@ -6,10 +6,10 @@ */ // Wolf includes -#include "base/common/wolf.h" -#include "base/problem/problem.h" -#include "base/frame/frame_base.h" -#include "base/trajectory_base.h" +#include "core/common/wolf.h" +#include "core/problem/problem.h" +#include "core/frame/frame_base.h" +#include "core/trajectory_base.h" // STL includes #include <list> diff --git a/src/examples/test_sparsification.cpp b/src/examples/test_sparsification.cpp index 7b9e85c08..fa577c15b 100644 --- a/src/examples/test_sparsification.cpp +++ b/src/examples/test_sparsification.cpp @@ -14,10 +14,10 @@ #include <queue> //Wolf includes -#include "base/capture/capture_void.h" -#include "base/feature/feature_odom_2D.h" -#include "base/factor/factor_base.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/capture/capture_void.h" +#include "core/feature/feature_odom_2D.h" +#include "core/factor/factor_base.h" +#include "core/ceres_wrapper/ceres_manager.h" // EIGEN //#include <Eigen/CholmodSupport> diff --git a/src/examples/test_state_quaternion.cpp b/src/examples/test_state_quaternion.cpp index 9bdcd7c4a..51cf76ffc 100644 --- a/src/examples/test_state_quaternion.cpp +++ b/src/examples/test_state_quaternion.cpp @@ -5,9 +5,9 @@ * \author: jsola */ -#include "base/frame/frame_base.h" -#include "base/state_block/state_quaternion.h" -#include "base/time_stamp.h" +#include "core/frame/frame_base.h" +#include "core/state_block/state_quaternion.h" +#include "core/time_stamp.h" #include <iostream> diff --git a/src/examples/test_tracker_ORB.cpp b/src/examples/test_tracker_ORB.cpp index 536e06d62..89ea1800a 100644 --- a/src/examples/test_tracker_ORB.cpp +++ b/src/examples/test_tracker_ORB.cpp @@ -11,7 +11,7 @@ #include <matchers/bruteforce_hamming_2/matcher_bruteforce_hamming_2.h> //Wolf -#include "base/processor/processor_tracker_landmark_image.h" +#include "core/processor/processor_tracker_landmark_image.h" int main(int argc, char** argv) { diff --git a/src/examples/test_wolf_autodiffwrapper.cpp b/src/examples/test_wolf_autodiffwrapper.cpp index 1fa76e585..8d0897956 100644 --- a/src/examples/test_wolf_autodiffwrapper.cpp +++ b/src/examples/test_wolf_autodiffwrapper.cpp @@ -12,8 +12,8 @@ //Wolf includes #include "wolf_manager.h" -#include "base/capture/capture_void.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/capture/capture_void.h" +#include "core/ceres_wrapper/ceres_manager.h" int main(int argc, char** argv) { diff --git a/src/examples/test_wolf_factories.cpp b/src/examples/test_wolf_factories.cpp index 728e5ef4d..e4adbd77f 100644 --- a/src/examples/test_wolf_factories.cpp +++ b/src/examples/test_wolf_factories.cpp @@ -5,21 +5,21 @@ * \author: jsola */ -#include "base/processor/processor_IMU.h" -#include "base/sensor/sensor_GPS_fix.h" -#include "base/hardware_base.h" -#include "base/sensor/sensor_camera.h" -#include "base/sensor/sensor_odom_2D.h" +#include "core/processor/processor_IMU.h" +#include "core/sensor/sensor_GPS_fix.h" +#include "core/hardware_base.h" +#include "core/sensor/sensor_camera.h" +#include "core/sensor/sensor_odom_2D.h" #include "../sensor_imu.h" //#include "../sensor_gps.h" -#include "base/processor/processor_odom_2D.h" -#include "base/processor/processor_odom_3D.h" +#include "core/processor/processor_odom_2D.h" +#include "core/processor/processor_odom_3D.h" #include "../processor_image_feature.h" -#include "base/problem/problem.h" +#include "core/problem/problem.h" -#include "base/factory.h" +#include "core/factory.h" #include <iostream> #include <iomanip> diff --git a/src/examples/test_wolf_imported_graph.cpp b/src/examples/test_wolf_imported_graph.cpp index 1113af8b7..9463399ff 100644 --- a/src/examples/test_wolf_imported_graph.cpp +++ b/src/examples/test_wolf_imported_graph.cpp @@ -12,8 +12,8 @@ //Wolf includes #include "wolf_manager.h" -#include "base/capture/capture_void.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/capture/capture_void.h" +#include "core/ceres_wrapper/ceres_manager.h" // EIGEN //#include <Eigen/CholmodSupport> diff --git a/src/examples/test_wolf_logging.cpp b/src/examples/test_wolf_logging.cpp index e188ff815..a4f3eb8a4 100644 --- a/src/examples/test_wolf_logging.cpp +++ b/src/examples/test_wolf_logging.cpp @@ -5,8 +5,8 @@ * \author: Jeremie Deray */ -#include "base/common/wolf.h" -#include "base/logging.h" +#include "core/common/wolf.h" +#include "core/logging.h" int main(int, char*[]) { diff --git a/src/examples/test_wolf_prunning.cpp b/src/examples/test_wolf_prunning.cpp index f3ed29007..de917e471 100644 --- a/src/examples/test_wolf_prunning.cpp +++ b/src/examples/test_wolf_prunning.cpp @@ -12,9 +12,9 @@ //Wolf includes #include "wolf_manager.h" -#include "base/capture/capture_void.h" -#include "base/factor/factor_base.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/capture/capture_void.h" +#include "core/factor/factor_base.h" +#include "core/ceres_wrapper/ceres_manager.h" // EIGEN //#include <Eigen/CholmodSupport> diff --git a/src/examples/test_wolf_root.cpp b/src/examples/test_wolf_root.cpp index ff78c97b0..4ea048471 100644 --- a/src/examples/test_wolf_root.cpp +++ b/src/examples/test_wolf_root.cpp @@ -6,7 +6,7 @@ */ //Wolf -#include "base/common/wolf.h" +#include "core/common/wolf.h" //std #include <iostream> diff --git a/src/examples/test_yaml.cpp b/src/examples/test_yaml.cpp index cfd03d18d..f67833444 100644 --- a/src/examples/test_yaml.cpp +++ b/src/examples/test_yaml.cpp @@ -5,10 +5,10 @@ * \author: jsola */ -#include "base/pinhole_tools.h" +#include "core/pinhole_tools.h" #include "yaml/yaml_conversion.h" #include "processor_image_feature.h" -#include "base/factory.h" +#include "core/factory.h" #include <yaml-cpp/yaml.h> diff --git a/src/examples/test_yaml_conversions.cpp b/src/examples/test_yaml_conversions.cpp index 78cf30da7..b8e1f41f9 100644 --- a/src/examples/test_yaml_conversions.cpp +++ b/src/examples/test_yaml_conversions.cpp @@ -5,7 +5,7 @@ * \author: jsola */ -#include "base/yaml/yaml_conversion.h" +#include "core/yaml/yaml_conversion.h" #include <yaml-cpp/yaml.h> diff --git a/src/processor/processor_gnss_fix.cpp b/src/processor/processor_gnss_fix.cpp index d041d8e01..dcf08db23 100644 --- a/src/processor/processor_gnss_fix.cpp +++ b/src/processor/processor_gnss_fix.cpp @@ -180,7 +180,7 @@ ProcessorBasePtr ProcessorGnssFix::create(const std::string& _unique_name, const // Register in the SensorFactory -#include "base/processor/processor_factory.h" +#include "core/processor/processor_factory.h" namespace wolf { WOLF_REGISTER_PROCESSOR("GNSS FIX",ProcessorGnssFix) } // namespace wolf diff --git a/src/processor/processor_gnss_single_diff.cpp b/src/processor/processor_gnss_single_diff.cpp index 3263b361e..f9b62fd70 100644 --- a/src/processor/processor_gnss_single_diff.cpp +++ b/src/processor/processor_gnss_single_diff.cpp @@ -94,7 +94,7 @@ ProcessorBasePtr ProcessorGnssSingleDiff::create(const std::string& _unique_name // Register in the SensorFactory -#include "base/processor/processor_factory.h" +#include "core/processor/processor_factory.h" namespace wolf { WOLF_REGISTER_PROCESSOR("GNSS SINGLE DIFFERENCES",ProcessorGnssSingleDiff) } // namespace wolf diff --git a/src/sensor/sensor_gnss.cpp b/src/sensor/sensor_gnss.cpp index d91242cc5..9ee0f26f8 100644 --- a/src/sensor/sensor_gnss.cpp +++ b/src/sensor/sensor_gnss.cpp @@ -1,6 +1,6 @@ #include "gnss/sensor/sensor_gnss.h" -#include "base/state_block/state_block.h" -#include "base/state_block/state_quaternion.h" +#include "core/state_block/state_block.h" +#include "core/state_block/state_quaternion.h" namespace wolf { @@ -212,7 +212,7 @@ SensorBasePtr SensorGnss::create(const std::string& _unique_name, const Eigen::V // Register in the SensorFactory -#include "base/sensor/sensor_factory.h" +#include "core/sensor/sensor_factory.h" namespace wolf { WOLF_REGISTER_SENSOR("GNSS",SensorGnss) } // namespace wolf diff --git a/src/yaml/processor_IMU_yaml.cpp b/src/yaml/processor_IMU_yaml.cpp index 2cfc70f46..5304c89f0 100644 --- a/src/yaml/processor_IMU_yaml.cpp +++ b/src/yaml/processor_IMU_yaml.cpp @@ -6,11 +6,11 @@ */ // wolf yaml -#include "base/processor/processor_IMU.h" -#include "base/yaml/yaml_conversion.h" +#include "core/processor/processor_IMU.h" +#include "core/yaml/yaml_conversion.h" // wolf -#include "base/factory.h" +#include "core/factory.h" // yaml-cpp library #include <yaml-cpp/yaml.h> diff --git a/src/yaml/processor_image_yaml.cpp b/src/yaml/processor_image_yaml.cpp index a02d44208..9979a7f04 100644 --- a/src/yaml/processor_image_yaml.cpp +++ b/src/yaml/processor_image_yaml.cpp @@ -6,15 +6,15 @@ */ // wolf yaml -#include "base/yaml/yaml_conversion.h" +#include "core/yaml/yaml_conversion.h" // wolf -#include "base/factory.h" +#include "core/factory.h" // yaml-cpp library #include <yaml-cpp/yaml.h> -#include "base/processor/processor_params_image.h" +#include "core/processor/processor_params_image.h" namespace wolf { diff --git a/src/yaml/processor_odom_3D_yaml.cpp b/src/yaml/processor_odom_3D_yaml.cpp index 5c2172ea9..2ef1308e5 100644 --- a/src/yaml/processor_odom_3D_yaml.cpp +++ b/src/yaml/processor_odom_3D_yaml.cpp @@ -6,11 +6,11 @@ */ // wolf yaml -#include "base/yaml/yaml_conversion.h" +#include "core/yaml/yaml_conversion.h" // wolf -#include "base/processor/processor_odom_3D.h" -#include "base/factory.h" +#include "core/processor/processor_odom_3D.h" +#include "core/factory.h" // yaml-cpp library #include <yaml-cpp/yaml.h> diff --git a/src/yaml/processor_tracker_feature_trifocal_yaml.cpp b/src/yaml/processor_tracker_feature_trifocal_yaml.cpp index db78505d9..d776e06c7 100644 --- a/src/yaml/processor_tracker_feature_trifocal_yaml.cpp +++ b/src/yaml/processor_tracker_feature_trifocal_yaml.cpp @@ -6,11 +6,11 @@ */ // wolf yaml -#include "base/processor/processor_tracker_feature_trifocal.h" -#include "base/yaml/yaml_conversion.h" +#include "core/processor/processor_tracker_feature_trifocal.h" +#include "core/yaml/yaml_conversion.h" // wolf -#include "base/factory.h" +#include "core/factory.h" // yaml-cpp library #include <yaml-cpp/yaml.h> diff --git a/src/yaml/sensor_IMU_yaml.cpp b/src/yaml/sensor_IMU_yaml.cpp index cc3dbb649..a4ecd3e4e 100644 --- a/src/yaml/sensor_IMU_yaml.cpp +++ b/src/yaml/sensor_IMU_yaml.cpp @@ -6,11 +6,11 @@ */ // wolf yaml -#include "base/sensor/sensor_IMU.h" -#include "base/yaml/yaml_conversion.h" +#include "core/sensor/sensor_IMU.h" +#include "core/yaml/yaml_conversion.h" // wolf -#include "base/factory.h" +#include "core/factory.h" // yaml-cpp library #include <yaml-cpp/yaml.h> diff --git a/src/yaml/sensor_camera_yaml.cpp b/src/yaml/sensor_camera_yaml.cpp index 5e5e3df19..dee2ba9e3 100644 --- a/src/yaml/sensor_camera_yaml.cpp +++ b/src/yaml/sensor_camera_yaml.cpp @@ -6,11 +6,11 @@ */ // wolf yaml -#include "base/yaml/yaml_conversion.h" +#include "core/yaml/yaml_conversion.h" // wolf -#include "base/sensor/sensor_camera.h" -#include "base/factory.h" +#include "core/sensor/sensor_camera.h" +#include "core/factory.h" // yaml-cpp library #include <yaml-cpp/yaml.h> diff --git a/src/yaml/sensor_laser_2D_yaml.cpp b/src/yaml/sensor_laser_2D_yaml.cpp index e687c1446..7ec160f2b 100644 --- a/src/yaml/sensor_laser_2D_yaml.cpp +++ b/src/yaml/sensor_laser_2D_yaml.cpp @@ -6,12 +6,12 @@ */ // wolf yaml -#include "base/yaml/yaml_conversion.h" +#include "core/yaml/yaml_conversion.h" // wolf -//#include "base/intrinsics_factory.h" -#include "base/factory.h" -#include "base/sensor/sensor_laser_2D.h" +//#include "core/intrinsics_factory.h" +#include "core/factory.h" +#include "core/sensor/sensor_laser_2D.h" // yaml library #include <yaml-cpp/yaml.h> diff --git a/src/yaml/sensor_odom_3D_yaml.cpp b/src/yaml/sensor_odom_3D_yaml.cpp index 63a7baa2c..ccc9b3f51 100644 --- a/src/yaml/sensor_odom_3D_yaml.cpp +++ b/src/yaml/sensor_odom_3D_yaml.cpp @@ -6,11 +6,11 @@ */ // wolf yaml -#include "base/yaml/yaml_conversion.h" +#include "core/yaml/yaml_conversion.h" // wolf -#include "base/sensor/sensor_odom_3D.h" -#include "base/factory.h" +#include "core/sensor/sensor_odom_3D.h" +#include "core/factory.h" // yaml-cpp library #include <yaml-cpp/yaml.h> diff --git a/test/gtest_factor_gnss_fix_2D.cpp b/test/gtest_factor_gnss_fix_2D.cpp index 23983d606..555fb301f 100644 --- a/test/gtest_factor_gnss_fix_2D.cpp +++ b/test/gtest_factor_gnss_fix_2D.cpp @@ -9,11 +9,11 @@ #include "gnss/factor/factor_gnss_fix_2D.h" #include "utils_gtest.h" -#include "base/problem/problem.h" +#include "core/problem/problem.h" #include "gnss/sensor/sensor_gnss.h" #include "gnss/processor/processor_gnss_fix.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/ceres_wrapper/ceres_manager.h" using namespace Eigen; diff --git a/test/gtest_factor_gnss_single_diff_2D.cpp b/test/gtest_factor_gnss_single_diff_2D.cpp index 20c14da10..ca243a4eb 100644 --- a/test/gtest_factor_gnss_single_diff_2D.cpp +++ b/test/gtest_factor_gnss_single_diff_2D.cpp @@ -9,14 +9,14 @@ #include "gnss/factor/factor_gnss_single_diff_2D.h" #include "utils_gtest.h" -#include "base/capture/capture_motion.h" -#include "base/problem/problem.h" +#include "core/capture/capture_motion.h" +#include "core/problem/problem.h" #include "gnss/sensor/sensor_gnss.h" -#include "base/sensor/sensor_odom_2D.h" -#include "base/processor/processor_odom_2D.h" +#include "core/sensor/sensor_odom_2D.h" +#include "core/processor/processor_odom_2D.h" #include "gnss/processor/processor_gnss_single_diff.h" -#include "base/ceres_wrapper/ceres_manager.h" +#include "core/ceres_wrapper/ceres_manager.h" using namespace Eigen; diff --git a/test/serialization/cereal/gtest_serialization_eigen_geometry.cpp b/test/serialization/cereal/gtest_serialization_eigen_geometry.cpp index ae4a43a3b..87cafb4d5 100644 --- a/test/serialization/cereal/gtest_serialization_eigen_geometry.cpp +++ b/test/serialization/cereal/gtest_serialization_eigen_geometry.cpp @@ -5,7 +5,7 @@ * Author: Jeremie Deray */ -#include "base/common/wolf.h" +#include "core/common/wolf.h" #include "../../utils_gtest.h" #include "../../../serialization/cereal/serialization_eigen_geometry.h" diff --git a/test/serialization/cereal/gtest_serialization_eigen_sparse.cpp b/test/serialization/cereal/gtest_serialization_eigen_sparse.cpp index c7f7249a5..0b803afdd 100644 --- a/test/serialization/cereal/gtest_serialization_eigen_sparse.cpp +++ b/test/serialization/cereal/gtest_serialization_eigen_sparse.cpp @@ -5,7 +5,7 @@ * Author: Jeremie Deray */ -#include "base/common/wolf.h" +#include "core/common/wolf.h" #include "../../utils_gtest.h" #include "../../../serialization/cereal/serialization_eigen_sparse.h" -- GitLab