From fbcfa65230a377a24cabff692bb19feabb3edbc6 Mon Sep 17 00:00:00 2001 From: Wolfgang Hess Date: Wed, 27 Jan 2021 13:50:22 +0100 Subject: [PATCH] Clean up the public headers in `common`. (#1805) The header ceres_solver_options.h is not used as part of public API anymore. lua_parameter_dictionary_test_helpers.h is only used in tests. Signed-off-by: Wolfgang Hess --- cartographer/common/{ => internal}/ceres_solver_options.cc | 2 +- cartographer/common/{ => internal}/ceres_solver_options.h | 0 .../testing}/lua_parameter_dictionary_test_helpers.h | 0 cartographer/common/lua_parameter_dictionary_test.cc | 2 +- cartographer/io/probability_grid_points_processor_test.cc | 2 +- cartographer/mapping/2d/range_data_inserter_2d_test.cc | 2 +- cartographer/mapping/2d/submap_2d_test.cc | 2 +- cartographer/mapping/3d/range_data_inserter_3d_test.cc | 2 +- cartographer/mapping/internal/2d/normal_estimation_2d_test.cc | 2 +- cartographer/mapping/internal/2d/pose_graph_2d_test.cc | 2 +- .../mapping/internal/2d/scan_matching/ceres_scan_matcher_2d.cc | 2 +- .../internal/2d/scan_matching/ceres_scan_matcher_2d_test.cc | 2 +- .../2d/scan_matching/fast_correlative_scan_matcher_2d_test.cc | 2 +- .../scan_matching/real_time_correlative_scan_matcher_2d_test.cc | 2 +- .../2d/scan_matching/tsdf_match_cost_function_2d_test.cc | 2 +- .../mapping/internal/2d/tsdf_range_data_inserter_2d_test.cc | 2 +- .../mapping/internal/3d/local_trajectory_builder_3d_test.cc | 2 +- .../mapping/internal/3d/scan_matching/ceres_scan_matcher_3d.cc | 2 +- .../internal/3d/scan_matching/ceres_scan_matcher_3d_test.cc | 2 +- .../3d/scan_matching/fast_correlative_scan_matcher_3d_test.cc | 2 +- .../scan_matching/real_time_correlative_scan_matcher_3d_test.cc | 2 +- cartographer/mapping/internal/imu_based_pose_extrapolator.h | 2 +- cartographer/mapping/internal/motion_filter_test.cc | 2 +- .../mapping/internal/optimization/optimization_problem_2d.cc | 2 +- .../mapping/internal/optimization/optimization_problem_3d.cc | 2 +- .../internal/optimization/optimization_problem_3d_test.cc | 2 +- .../internal/optimization/optimization_problem_options.cc | 2 +- cartographer/mapping/internal/testing/test_helpers.cc | 2 +- cartographer/mapping/pose_extrapolator_interface.cc | 2 +- 29 files changed, 27 insertions(+), 27 deletions(-) rename cartographer/common/{ => internal}/ceres_solver_options.cc (96%) rename cartographer/common/{ => internal}/ceres_solver_options.h (100%) rename cartographer/common/{ => internal/testing}/lua_parameter_dictionary_test_helpers.h (100%) diff --git a/cartographer/common/ceres_solver_options.cc b/cartographer/common/internal/ceres_solver_options.cc similarity index 96% rename from cartographer/common/ceres_solver_options.cc rename to cartographer/common/internal/ceres_solver_options.cc index 25cd558..fd13e02 100644 --- a/cartographer/common/ceres_solver_options.cc +++ b/cartographer/common/internal/ceres_solver_options.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "cartographer/common/ceres_solver_options.h" +#include "cartographer/common/internal/ceres_solver_options.h" namespace cartographer { namespace common { diff --git a/cartographer/common/ceres_solver_options.h b/cartographer/common/internal/ceres_solver_options.h similarity index 100% rename from cartographer/common/ceres_solver_options.h rename to cartographer/common/internal/ceres_solver_options.h diff --git a/cartographer/common/lua_parameter_dictionary_test_helpers.h b/cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h similarity index 100% rename from cartographer/common/lua_parameter_dictionary_test_helpers.h rename to cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h diff --git a/cartographer/common/lua_parameter_dictionary_test.cc b/cartographer/common/lua_parameter_dictionary_test.cc index d794e02..ada3b7b 100644 --- a/cartographer/common/lua_parameter_dictionary_test.cc +++ b/cartographer/common/lua_parameter_dictionary_test.cc @@ -21,7 +21,7 @@ #include #include "absl/memory/memory.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "gtest/gtest.h" namespace cartographer { diff --git a/cartographer/io/probability_grid_points_processor_test.cc b/cartographer/io/probability_grid_points_processor_test.cc index 8c48f6d..1af0a25 100644 --- a/cartographer/io/probability_grid_points_processor_test.cc +++ b/cartographer/io/probability_grid_points_processor_test.cc @@ -18,8 +18,8 @@ #include +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/lua_parameter_dictionary.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/port.h" #include "cartographer/io/fake_file_writer.h" #include "cartographer/io/points_processor_pipeline_builder.h" diff --git a/cartographer/mapping/2d/range_data_inserter_2d_test.cc b/cartographer/mapping/2d/range_data_inserter_2d_test.cc index 1725334..6b182aa 100644 --- a/cartographer/mapping/2d/range_data_inserter_2d_test.cc +++ b/cartographer/mapping/2d/range_data_inserter_2d_test.cc @@ -17,8 +17,8 @@ #include #include "absl/memory/memory.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/lua_parameter_dictionary.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" #include "cartographer/mapping/2d/probability_grid.h" #include "cartographer/mapping/2d/probability_grid_range_data_inserter_2d.h" #include "cartographer/mapping/probability_values.h" diff --git a/cartographer/mapping/2d/submap_2d_test.cc b/cartographer/mapping/2d/submap_2d_test.cc index 6b32b8a..d9b6e21 100644 --- a/cartographer/mapping/2d/submap_2d_test.cc +++ b/cartographer/mapping/2d/submap_2d_test.cc @@ -21,8 +21,8 @@ #include #include +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/lua_parameter_dictionary.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/port.h" #include "cartographer/mapping/2d/probability_grid.h" #include "cartographer/transform/transform.h" diff --git a/cartographer/mapping/3d/range_data_inserter_3d_test.cc b/cartographer/mapping/3d/range_data_inserter_3d_test.cc index 83dcd4e..a7f92b3 100644 --- a/cartographer/mapping/3d/range_data_inserter_3d_test.cc +++ b/cartographer/mapping/3d/range_data_inserter_3d_test.cc @@ -19,7 +19,7 @@ #include #include -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "gmock/gmock.h" namespace cartographer { diff --git a/cartographer/mapping/internal/2d/normal_estimation_2d_test.cc b/cartographer/mapping/internal/2d/normal_estimation_2d_test.cc index bb6c453..336d31d 100644 --- a/cartographer/mapping/internal/2d/normal_estimation_2d_test.cc +++ b/cartographer/mapping/internal/2d/normal_estimation_2d_test.cc @@ -16,8 +16,8 @@ #include "cartographer/mapping/internal/2d/normal_estimation_2d.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/lua_parameter_dictionary.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/math.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/cartographer/mapping/internal/2d/pose_graph_2d_test.cc b/cartographer/mapping/internal/2d/pose_graph_2d_test.cc index 924f36e..2ecdfd1 100644 --- a/cartographer/mapping/internal/2d/pose_graph_2d_test.cc +++ b/cartographer/mapping/internal/2d/pose_graph_2d_test.cc @@ -21,7 +21,7 @@ #include #include "absl/memory/memory.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/thread_pool.h" #include "cartographer/common/time.h" #include "cartographer/mapping/2d/probability_grid_range_data_inserter_2d.h" diff --git a/cartographer/mapping/internal/2d/scan_matching/ceres_scan_matcher_2d.cc b/cartographer/mapping/internal/2d/scan_matching/ceres_scan_matcher_2d.cc index 3590d31..2fe2219 100644 --- a/cartographer/mapping/internal/2d/scan_matching/ceres_scan_matcher_2d.cc +++ b/cartographer/mapping/internal/2d/scan_matching/ceres_scan_matcher_2d.cc @@ -20,7 +20,7 @@ #include #include "Eigen/Core" -#include "cartographer/common/ceres_solver_options.h" +#include "cartographer/common/internal/ceres_solver_options.h" #include "cartographer/common/lua_parameter_dictionary.h" #include "cartographer/mapping/2d/grid_2d.h" #include "cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d.h" diff --git a/cartographer/mapping/internal/2d/scan_matching/ceres_scan_matcher_2d_test.cc b/cartographer/mapping/internal/2d/scan_matching/ceres_scan_matcher_2d_test.cc index 88ec321..74036ad 100644 --- a/cartographer/mapping/internal/2d/scan_matching/ceres_scan_matcher_2d_test.cc +++ b/cartographer/mapping/internal/2d/scan_matching/ceres_scan_matcher_2d_test.cc @@ -19,8 +19,8 @@ #include #include "absl/memory/memory.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/lua_parameter_dictionary.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" #include "cartographer/mapping/2d/probability_grid.h" #include "cartographer/mapping/probability_values.h" #include "cartographer/sensor/point_cloud.h" diff --git a/cartographer/mapping/internal/2d/scan_matching/fast_correlative_scan_matcher_2d_test.cc b/cartographer/mapping/internal/2d/scan_matching/fast_correlative_scan_matcher_2d_test.cc index c50252f..2de8393 100644 --- a/cartographer/mapping/internal/2d/scan_matching/fast_correlative_scan_matcher_2d_test.cc +++ b/cartographer/mapping/internal/2d/scan_matching/fast_correlative_scan_matcher_2d_test.cc @@ -22,7 +22,7 @@ #include #include -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/mapping/2d/probability_grid.h" #include "cartographer/mapping/2d/probability_grid_range_data_inserter_2d.h" #include "cartographer/transform/rigid_transform_test_helpers.h" diff --git a/cartographer/mapping/internal/2d/scan_matching/real_time_correlative_scan_matcher_2d_test.cc b/cartographer/mapping/internal/2d/scan_matching/real_time_correlative_scan_matcher_2d_test.cc index 27df5a7..b69cdd0 100644 --- a/cartographer/mapping/internal/2d/scan_matching/real_time_correlative_scan_matcher_2d_test.cc +++ b/cartographer/mapping/internal/2d/scan_matching/real_time_correlative_scan_matcher_2d_test.cc @@ -21,7 +21,7 @@ #include "Eigen/Geometry" #include "absl/memory/memory.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/mapping/2d/probability_grid.h" #include "cartographer/mapping/2d/probability_grid_range_data_inserter_2d.h" #include "cartographer/mapping/2d/tsdf_2d.h" diff --git a/cartographer/mapping/internal/2d/scan_matching/tsdf_match_cost_function_2d_test.cc b/cartographer/mapping/internal/2d/scan_matching/tsdf_match_cost_function_2d_test.cc index 04c6f05..dcebdc7 100644 --- a/cartographer/mapping/internal/2d/scan_matching/tsdf_match_cost_function_2d_test.cc +++ b/cartographer/mapping/internal/2d/scan_matching/tsdf_match_cost_function_2d_test.cc @@ -16,8 +16,8 @@ #include "cartographer/mapping/internal/2d/scan_matching/tsdf_match_cost_function_2d.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/lua_parameter_dictionary.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" #include "cartographer/mapping/2d/tsdf_2d.h" #include "cartographer/mapping/internal/2d/tsdf_range_data_inserter_2d.h" #include "gmock/gmock.h" diff --git a/cartographer/mapping/internal/2d/tsdf_range_data_inserter_2d_test.cc b/cartographer/mapping/internal/2d/tsdf_range_data_inserter_2d_test.cc index da06a89..0850e6e 100644 --- a/cartographer/mapping/internal/2d/tsdf_range_data_inserter_2d_test.cc +++ b/cartographer/mapping/internal/2d/tsdf_range_data_inserter_2d_test.cc @@ -16,8 +16,8 @@ #include "cartographer/mapping/internal/2d/tsdf_range_data_inserter_2d.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/lua_parameter_dictionary.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" #include "gmock/gmock.h" namespace cartographer { diff --git a/cartographer/mapping/internal/3d/local_trajectory_builder_3d_test.cc b/cartographer/mapping/internal/3d/local_trajectory_builder_3d_test.cc index 2602649..e8f1269 100644 --- a/cartographer/mapping/internal/3d/local_trajectory_builder_3d_test.cc +++ b/cartographer/mapping/internal/3d/local_trajectory_builder_3d_test.cc @@ -20,7 +20,7 @@ #include #include "Eigen/Core" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/time.h" #include "cartographer/mapping/3d/hybrid_grid.h" #include "cartographer/mapping/internal/3d/local_trajectory_builder_options_3d.h" diff --git a/cartographer/mapping/internal/3d/scan_matching/ceres_scan_matcher_3d.cc b/cartographer/mapping/internal/3d/scan_matching/ceres_scan_matcher_3d.cc index 2c10753..5aab1fd 100644 --- a/cartographer/mapping/internal/3d/scan_matching/ceres_scan_matcher_3d.cc +++ b/cartographer/mapping/internal/3d/scan_matching/ceres_scan_matcher_3d.cc @@ -21,7 +21,7 @@ #include #include "absl/memory/memory.h" -#include "cartographer/common/ceres_solver_options.h" +#include "cartographer/common/internal/ceres_solver_options.h" #include "cartographer/mapping/internal/3d/rotation_parameterization.h" #include "cartographer/mapping/internal/3d/scan_matching/intensity_cost_function_3d.h" #include "cartographer/mapping/internal/3d/scan_matching/occupied_space_cost_function_3d.h" diff --git a/cartographer/mapping/internal/3d/scan_matching/ceres_scan_matcher_3d_test.cc b/cartographer/mapping/internal/3d/scan_matching/ceres_scan_matcher_3d_test.cc index 68a6770..bc0489f 100644 --- a/cartographer/mapping/internal/3d/scan_matching/ceres_scan_matcher_3d_test.cc +++ b/cartographer/mapping/internal/3d/scan_matching/ceres_scan_matcher_3d_test.cc @@ -19,7 +19,7 @@ #include #include "Eigen/Core" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/mapping/3d/hybrid_grid.h" #include "cartographer/sensor/point_cloud.h" #include "cartographer/transform/rigid_transform.h" diff --git a/cartographer/mapping/internal/3d/scan_matching/fast_correlative_scan_matcher_3d_test.cc b/cartographer/mapping/internal/3d/scan_matching/fast_correlative_scan_matcher_3d_test.cc index 0bcfece..df610e3 100644 --- a/cartographer/mapping/internal/3d/scan_matching/fast_correlative_scan_matcher_3d_test.cc +++ b/cartographer/mapping/internal/3d/scan_matching/fast_correlative_scan_matcher_3d_test.cc @@ -22,7 +22,7 @@ #include #include "absl/memory/memory.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/mapping/3d/range_data_inserter_3d.h" #include "cartographer/transform/rigid_transform_test_helpers.h" #include "cartographer/transform/transform.h" diff --git a/cartographer/mapping/internal/3d/scan_matching/real_time_correlative_scan_matcher_3d_test.cc b/cartographer/mapping/internal/3d/scan_matching/real_time_correlative_scan_matcher_3d_test.cc index 1d841a9..da3223d 100644 --- a/cartographer/mapping/internal/3d/scan_matching/real_time_correlative_scan_matcher_3d_test.cc +++ b/cartographer/mapping/internal/3d/scan_matching/real_time_correlative_scan_matcher_3d_test.cc @@ -19,7 +19,7 @@ #include #include "Eigen/Core" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/mapping/3d/hybrid_grid.h" #include "cartographer/mapping/internal/scan_matching/real_time_correlative_scan_matcher.h" #include "cartographer/sensor/point_cloud.h" diff --git a/cartographer/mapping/internal/imu_based_pose_extrapolator.h b/cartographer/mapping/internal/imu_based_pose_extrapolator.h index 1234fd0..6adc9b7 100644 --- a/cartographer/mapping/internal/imu_based_pose_extrapolator.h +++ b/cartographer/mapping/internal/imu_based_pose_extrapolator.h @@ -21,7 +21,7 @@ #include #include -#include "cartographer/common/ceres_solver_options.h" +#include "cartographer/common/internal/ceres_solver_options.h" #include "cartographer/common/histogram.h" #include "cartographer/mapping/pose_extrapolator_interface.h" #include "cartographer/sensor/imu_data.h" diff --git a/cartographer/mapping/internal/motion_filter_test.cc b/cartographer/mapping/internal/motion_filter_test.cc index 7ecc2d8..c5002fa 100644 --- a/cartographer/mapping/internal/motion_filter_test.cc +++ b/cartographer/mapping/internal/motion_filter_test.cc @@ -16,7 +16,7 @@ #include "cartographer/mapping/internal/motion_filter.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "gmock/gmock.h" namespace cartographer { diff --git a/cartographer/mapping/internal/optimization/optimization_problem_2d.cc b/cartographer/mapping/internal/optimization/optimization_problem_2d.cc index c61d796..3faf255 100644 --- a/cartographer/mapping/internal/optimization/optimization_problem_2d.cc +++ b/cartographer/mapping/internal/optimization/optimization_problem_2d.cc @@ -24,7 +24,7 @@ #include #include -#include "cartographer/common/ceres_solver_options.h" +#include "cartographer/common/internal/ceres_solver_options.h" #include "cartographer/common/histogram.h" #include "cartographer/common/math.h" #include "cartographer/mapping/internal/optimization/ceres_pose.h" diff --git a/cartographer/mapping/internal/optimization/optimization_problem_3d.cc b/cartographer/mapping/internal/optimization/optimization_problem_3d.cc index 4494045..fca36d1 100644 --- a/cartographer/mapping/internal/optimization/optimization_problem_3d.cc +++ b/cartographer/mapping/internal/optimization/optimization_problem_3d.cc @@ -27,7 +27,7 @@ #include "Eigen/Core" #include "absl/memory/memory.h" -#include "cartographer/common/ceres_solver_options.h" +#include "cartographer/common/internal/ceres_solver_options.h" #include "cartographer/common/math.h" #include "cartographer/common/time.h" #include "cartographer/mapping/internal/3d/imu_integration.h" diff --git a/cartographer/mapping/internal/optimization/optimization_problem_3d_test.cc b/cartographer/mapping/internal/optimization/optimization_problem_3d_test.cc index 92abbc6..26f9685 100644 --- a/cartographer/mapping/internal/optimization/optimization_problem_3d_test.cc +++ b/cartographer/mapping/internal/optimization/optimization_problem_3d_test.cc @@ -19,7 +19,7 @@ #include #include "Eigen/Core" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/common/time.h" #include "cartographer/mapping/internal/optimization/optimization_problem_options.h" #include "cartographer/transform/transform.h" diff --git a/cartographer/mapping/internal/optimization/optimization_problem_options.cc b/cartographer/mapping/internal/optimization/optimization_problem_options.cc index a17088a..39a0a56 100644 --- a/cartographer/mapping/internal/optimization/optimization_problem_options.cc +++ b/cartographer/mapping/internal/optimization/optimization_problem_options.cc @@ -16,7 +16,7 @@ #include "cartographer/mapping/internal/optimization/optimization_problem_options.h" -#include "cartographer/common/ceres_solver_options.h" +#include "cartographer/common/internal/ceres_solver_options.h" namespace cartographer { namespace mapping { diff --git a/cartographer/mapping/internal/testing/test_helpers.cc b/cartographer/mapping/internal/testing/test_helpers.cc index f8401dd..53fcd3d 100644 --- a/cartographer/mapping/internal/testing/test_helpers.cc +++ b/cartographer/mapping/internal/testing/test_helpers.cc @@ -19,7 +19,7 @@ #include "absl/memory/memory.h" #include "cartographer/common/config.h" #include "cartographer/common/configuration_file_resolver.h" -#include "cartographer/common/lua_parameter_dictionary_test_helpers.h" +#include "cartographer/common/internal/testing/lua_parameter_dictionary_test_helpers.h" #include "cartographer/sensor/timed_point_cloud_data.h" #include "cartographer/transform/transform.h" diff --git a/cartographer/mapping/pose_extrapolator_interface.cc b/cartographer/mapping/pose_extrapolator_interface.cc index 8030114..e408d3a 100644 --- a/cartographer/mapping/pose_extrapolator_interface.cc +++ b/cartographer/mapping/pose_extrapolator_interface.cc @@ -16,7 +16,7 @@ #include "cartographer/mapping/pose_extrapolator_interface.h" -#include "cartographer/common/ceres_solver_options.h" +#include "cartographer/common/internal/ceres_solver_options.h" #include "cartographer/common/time.h" #include "cartographer/mapping/internal/imu_based_pose_extrapolator.h" #include "cartographer/mapping/pose_extrapolator.h"