12345qiupeng
/
cartographer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move internal/mapping to mapping/internal. (#941)

master
Alexander Belyaev 2018-02-27 16:25:53 +01:00 committed by GitHub
parent 63fd497e0f
commit 29875117b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -75,8 +75,7 @@ if (NOT ${BUILD_PROMETHEUS})
list(REMOVE_ITEM ALL_EXECUTABLES ${ALL_PROMETHEUS_FILES})
endif()
set(INSTALL_SOURCE_HDRS ${ALL_LIBRARY_HDRS})
file(GLOB_RECURSE INTERNAL_HDRS "cartographer/internal/*.h"
"cartographer_grpc/internal/*.h")
file(GLOB_RECURSE INTERNAL_HDRS "cartographer/*/internal/*.h")
list(REMOVE_ITEM INSTALL_SOURCE_HDRS ${INTERNAL_HDRS})
file(GLOB_RECURSE ALL_PROTOS "*.proto")

2
cartographer/mapping/2d/local_trajectory_builder_options_2d.cc
View File

@ -16,10 +16,10 @@
#include "cartographer/mapping/2d/local_trajectory_builder_options_2d.h"
#include "cartographer/internal/mapping/motion_filter.h"
#include "cartographer/mapping/2d/scan_matching/ceres_scan_matcher_2d.h"
#include "cartographer/mapping/2d/scan_matching/real_time_correlative_scan_matcher_2d.h"
#include "cartographer/mapping/2d/submap_2d.h"
#include "cartographer/mapping/internal/motion_filter.h"
#include "cartographer/sensor/voxel_filter.h"
namespace cartographer {

2
cartographer/mapping/2d/scan_matching/ceres_scan_matcher_2d.cc
View File

@ -22,10 +22,10 @@
#include "Eigen/Core"
#include "cartographer/common/ceres_solver_options.h"
#include "cartographer/common/lua_parameter_dictionary.h"
#include "cartographer/internal/mapping/2d/scan_matching/occupied_space_cost_function_2d.h"
#include "cartographer/mapping/2d/probability_grid.h"
#include "cartographer/mapping/2d/scan_matching/rotation_delta_cost_functor_2d.h"
#include "cartographer/mapping/2d/scan_matching/translation_delta_cost_functor_2d.h"
#include "cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d.h"
#include "cartographer/transform/transform.h"
#include "ceres/ceres.h"
#include "glog/logging.h"

2
cartographer/mapping/3d/local_trajectory_builder_options_3d.cc
View File

@ -16,9 +16,9 @@
#include "cartographer/mapping/3d/local_trajectory_builder_options_3d.h"
#include "cartographer/internal/mapping/motion_filter.h"
#include "cartographer/mapping/3d/scan_matching/ceres_scan_matcher_3d.h"
#include "cartographer/mapping/3d/submap_3d.h"
#include "cartographer/mapping/internal/motion_filter.h"
#include "cartographer/mapping/scan_matching/real_time_correlative_scan_matcher.h"
#include "cartographer/sensor/voxel_filter.h"
#include "glog/logging.h"

4
cartographer/mapping/3d/pose_graph/optimization_problem_3d.cc
View File

@ -30,12 +30,12 @@
#include "cartographer/common/make_unique.h"
#include "cartographer/common/math.h"
#include "cartographer/common/time.h"
#include "cartographer/internal/mapping/3d/acceleration_cost_function_3d.h"
#include "cartographer/internal/mapping/3d/rotation_cost_function_3d.h"
#include "cartographer/mapping/3d/imu_integration.h"
#include "cartographer/mapping/3d/pose_graph/landmark_cost_function_3d.h"
#include "cartographer/mapping/3d/pose_graph/spa_cost_function_3d.h"
#include "cartographer/mapping/3d/rotation_parameterization.h"
#include "cartographer/mapping/internal/3d/acceleration_cost_function_3d.h"
#include "cartographer/mapping/internal/3d/rotation_cost_function_3d.h"
#include "cartographer/mapping/pose_graph/ceres_pose.h"
#include "cartographer/transform/timestamped_transform.h"
#include "cartographer/transform/transform.h"

2
cartographer/mapping/3d/scan_matching/ceres_scan_matcher_3d.cc
View File

@ -22,10 +22,10 @@
#include "cartographer/common/ceres_solver_options.h"
#include "cartographer/common/make_unique.h"
#include "cartographer/internal/mapping/3d/scan_matching/occupied_space_cost_function_3d.h"
#include "cartographer/mapping/3d/rotation_parameterization.h"
#include "cartographer/mapping/3d/scan_matching/rotation_delta_cost_functor_3d.h"
#include "cartographer/mapping/3d/scan_matching/translation_delta_cost_functor_3d.h"
#include "cartographer/mapping/internal/3d/scan_matching/occupied_space_cost_function_3d.h"
#include "cartographer/mapping/pose_graph/ceres_pose.h"
#include "cartographer/transform/rigid_transform.h"
#include "cartographer/transform/transform.h"

2
cartographer/internal/mapping/2d/local_trajectory_builder_2d.cc → cartographer/mapping/internal/2d/local_trajectory_builder_2d.cc
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "cartographer/internal/mapping/2d/local_trajectory_builder_2d.h"
#include "cartographer/mapping/internal/2d/local_trajectory_builder_2d.h"
#include <limits>
#include <memory>

8
cartographer/internal/mapping/2d/local_trajectory_builder_2d.h → cartographer/mapping/internal/2d/local_trajectory_builder_2d.h
View File

@ -14,17 +14,17 @@
* limitations under the License.
*/
#ifndef CARTOGRAPHER_INTERNAL_MAPPING_2D_LOCAL_TRAJECTORY_BUILDER_H_
#define CARTOGRAPHER_INTERNAL_MAPPING_2D_LOCAL_TRAJECTORY_BUILDER_H_
#ifndef CARTOGRAPHER_MAPPING_INTERNAL_2D_LOCAL_TRAJECTORY_BUILDER_H_
#define CARTOGRAPHER_MAPPING_INTERNAL_2D_LOCAL_TRAJECTORY_BUILDER_H_
#include <memory>
#include "cartographer/common/time.h"
#include "cartographer/internal/mapping/motion_filter.h"
#include "cartographer/mapping/2d/proto/local_trajectory_builder_options_2d.pb.h"
#include "cartographer/mapping/2d/scan_matching/ceres_scan_matcher_2d.h"
#include "cartographer/mapping/2d/scan_matching/real_time_correlative_scan_matcher_2d.h"
#include "cartographer/mapping/2d/submap_2d.h"
#include "cartographer/mapping/internal/motion_filter.h"
#include "cartographer/mapping/pose_extrapolator.h"
#include "cartographer/sensor/imu_data.h"
#include "cartographer/sensor/odometry_data.h"
@ -109,4 +109,4 @@ class LocalTrajectoryBuilder2D {
} // namespace mapping
} // namespace cartographer
#endif // CARTOGRAPHER_INTERNAL_MAPPING_2D_LOCAL_TRAJECTORY_BUILDER_H_
#endif // CARTOGRAPHER_MAPPING_INTERNAL_2D_LOCAL_TRAJECTORY_BUILDER_H_

6
cartographer/internal/mapping/2d/scan_matching/occupied_space_cost_function_2d.h → cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d.h
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef CARTOGRAPHER_INTERNAL_MAPPING_2D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_H_
#define CARTOGRAPHER_INTERNAL_MAPPING_2D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_H_
#ifndef CARTOGRAPHER_MAPPING_INTERNAL_2D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_H_
#define CARTOGRAPHER_MAPPING_INTERNAL_2D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_H_
#include "Eigen/Core"
#include "Eigen/Geometry"
@ -126,4 +126,4 @@ class OccupiedSpaceCostFunction2D {
} // namespace mapping
} // namespace cartographer
#endif // CARTOGRAPHER_INTERNAL_MAPPING_2D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_H_
#endif // CARTOGRAPHER_MAPPING_INTERNAL_2D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_H_

6
cartographer/internal/mapping/3d/acceleration_cost_function_3d.h → cartographer/mapping/internal/3d/acceleration_cost_function_3d.h
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef CARTOGRAPHER_INTERNAL_MAPPING_3D_ACCELERATION_COST_FUNCTION_3D_H_
#define CARTOGRAPHER_INTERNAL_MAPPING_3D_ACCELERATION_COST_FUNCTION_3D_H_
#ifndef CARTOGRAPHER_MAPPING_INTERNAL_3D_ACCELERATION_COST_FUNCTION_3D_H_
#define CARTOGRAPHER_MAPPING_INTERNAL_3D_ACCELERATION_COST_FUNCTION_3D_H_
#include "Eigen/Core"
#include "Eigen/Geometry"
@ -100,4 +100,4 @@ class AccelerationCostFunction3D {
} // namespace mapping
} // namespace cartographer
#endif // CARTOGRAPHER_INTERNAL_MAPPING_3D_ACCELERATION_COST_FUNCTION_3D_H_
#endif // CARTOGRAPHER_MAPPING_INTERNAL_3D_ACCELERATION_COST_FUNCTION_3D_H_

2
cartographer/internal/mapping/3d/local_trajectory_builder_3d.cc → cartographer/mapping/internal/3d/local_trajectory_builder_3d.cc
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "cartographer/internal/mapping/3d/local_trajectory_builder_3d.h"
#include "cartographer/mapping/internal/3d/local_trajectory_builder_3d.h"
#include <memory>

8
cartographer/internal/mapping/3d/local_trajectory_builder_3d.h → cartographer/mapping/internal/3d/local_trajectory_builder_3d.h
View File

@ -14,17 +14,17 @@
* limitations under the License.
*/
#ifndef CARTOGRAPHER_INTERNAL_MAPPING_3D_LOCAL_TRAJECTORY_BUILDER_3D_H_
#define CARTOGRAPHER_INTERNAL_MAPPING_3D_LOCAL_TRAJECTORY_BUILDER_3D_H_
#ifndef CARTOGRAPHER_MAPPING_INTERNAL_3D_LOCAL_TRAJECTORY_BUILDER_3D_H_
#define CARTOGRAPHER_MAPPING_INTERNAL_3D_LOCAL_TRAJECTORY_BUILDER_3D_H_
#include <memory>
#include "cartographer/common/time.h"
#include "cartographer/internal/mapping/motion_filter.h"
#include "cartographer/mapping/3d/proto/local_trajectory_builder_options_3d.pb.h"
#include "cartographer/mapping/3d/scan_matching/ceres_scan_matcher_3d.h"
#include "cartographer/mapping/3d/scan_matching/real_time_correlative_scan_matcher_3d.h"
#include "cartographer/mapping/3d/submap_3d.h"
#include "cartographer/mapping/internal/motion_filter.h"
#include "cartographer/mapping/pose_extrapolator.h"
#include "cartographer/sensor/imu_data.h"
#include "cartographer/sensor/odometry_data.h"
@ -97,4 +97,4 @@ class LocalTrajectoryBuilder3D {
} // namespace mapping
} // namespace cartographer
#endif // CARTOGRAPHER_INTERNAL_MAPPING_3D_LOCAL_TRAJECTORY_BUILDER_3D_H_
#endif // CARTOGRAPHER_MAPPING_INTERNAL_3D_LOCAL_TRAJECTORY_BUILDER_3D_H_

2
cartographer/internal/mapping/3d/local_trajectory_builder_3d_test.cc → cartographer/mapping/internal/3d/local_trajectory_builder_3d_test.cc
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "cartographer/internal/mapping/3d/local_trajectory_builder_3d.h"
#include "cartographer/mapping/internal/3d/local_trajectory_builder_3d.h"
#include <memory>
#include <random>

6
cartographer/internal/mapping/3d/rotation_cost_function_3d.h → cartographer/mapping/internal/3d/rotation_cost_function_3d.h
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef CARTOGRAPHER_INTERNAL_MAPPING_3D_ROTATION_COST_FUNCTION_3D_H_
#define CARTOGRAPHER_INTERNAL_MAPPING_3D_ROTATION_COST_FUNCTION_3D_H_
#ifndef CARTOGRAPHER_MAPPING_INTERNAL_3D_ROTATION_COST_FUNCTION_3D_H_
#define CARTOGRAPHER_MAPPING_INTERNAL_3D_ROTATION_COST_FUNCTION_3D_H_
#include "Eigen/Core"
#include "Eigen/Geometry"
@ -70,4 +70,4 @@ class RotationCostFunction {
} // namespace mapping
} // namespace cartographer
#endif // CARTOGRAPHER_INTERNAL_MAPPING_3D_ROTATION_COST_FUNCTION_3D_H_
#endif // CARTOGRAPHER_MAPPING_INTERNAL_3D_ROTATION_COST_FUNCTION_3D_H_

6
cartographer/internal/mapping/3d/scan_matching/occupied_space_cost_function_3d.h → cartographer/mapping/internal/3d/scan_matching/occupied_space_cost_function_3d.h
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef CARTOGRAPHER_INTERNAL_MAPPING_3D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_3D_H_
#define CARTOGRAPHER_INTERNAL_MAPPING_3D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_3D_H_
#ifndef CARTOGRAPHER_MAPPING_INTERNAL_3D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_3D_H_
#define CARTOGRAPHER_MAPPING_INTERNAL_3D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_3D_H_
#include "Eigen/Core"
#include "cartographer/mapping/3d/hybrid_grid.h"
@ -88,4 +88,4 @@ class OccupiedSpaceCostFunction3D {
} // namespace mapping
} // namespace cartographer
#endif // CARTOGRAPHER_INTERNAL_MAPPING_3D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_3D_H_
#endif // CARTOGRAPHER_MAPPING_INTERNAL_3D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_3D_H_

2
cartographer/internal/mapping/global_trajectory_builder.cc → cartographer/mapping/internal/global_trajectory_builder.cc
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "cartographer/internal/mapping/global_trajectory_builder.h"
#include "cartographer/mapping/internal/global_trajectory_builder.h"
#include <memory>

10
cartographer/internal/mapping/global_trajectory_builder.h → cartographer/mapping/internal/global_trajectory_builder.h
View File

@ -14,15 +14,15 @@
* limitations under the License.
*/
#ifndef CARTOGRAPHER_INTERNAL_MAPPING_GLOBAL_TRAJECTORY_BUILDER_H_
#define CARTOGRAPHER_INTERNAL_MAPPING_GLOBAL_TRAJECTORY_BUILDER_H_
#ifndef CARTOGRAPHER_MAPPING_INTERNAL_GLOBAL_TRAJECTORY_BUILDER_H_
#define CARTOGRAPHER_MAPPING_INTERNAL_GLOBAL_TRAJECTORY_BUILDER_H_
#include <memory>
#include "cartographer/internal/mapping/2d/local_trajectory_builder_2d.h"
#include "cartographer/internal/mapping/3d/local_trajectory_builder_3d.h"
#include "cartographer/mapping/2d/pose_graph_2d.h"
#include "cartographer/mapping/3d/pose_graph_3d.h"
#include "cartographer/mapping/internal/2d/local_trajectory_builder_2d.h"
#include "cartographer/mapping/internal/3d/local_trajectory_builder_3d.h"
#include "cartographer/mapping/local_slam_result_data.h"
#include "cartographer/mapping/trajectory_builder_interface.h"
@ -44,4 +44,4 @@ std::unique_ptr<TrajectoryBuilderInterface> CreateGlobalTrajectoryBuilder3D(
} // namespace mapping
} // namespace cartographer
#endif // CARTOGRAPHER_INTERNAL_MAPPING_GLOBAL_TRAJECTORY_BUILDER_H_
#endif // CARTOGRAPHER_MAPPING_INTERNAL_GLOBAL_TRAJECTORY_BUILDER_H_

2
cartographer/internal/mapping/motion_filter.cc → cartographer/mapping/internal/motion_filter.cc
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "cartographer/internal/mapping/motion_filter.h"
#include "cartographer/mapping/internal/motion_filter.h"
#include "cartographer/transform/transform.h"
#include "glog/logging.h"

6
cartographer/internal/mapping/motion_filter.h → cartographer/mapping/internal/motion_filter.h
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef CARTOGRAPHER_INTERNAL_MAPPING_MOTION_FILTER_H_
#define CARTOGRAPHER_INTERNAL_MAPPING_MOTION_FILTER_H_
#ifndef CARTOGRAPHER_MAPPING_INTERNAL_MOTION_FILTER_H_
#define CARTOGRAPHER_MAPPING_INTERNAL_MOTION_FILTER_H_
#include <limits>
@ -51,4 +51,4 @@ class MotionFilter {
} // namespace mapping
} // namespace cartographer
#endif // CARTOGRAPHER_INTERNAL_MAPPING_MOTION_FILTER_H_
#endif // CARTOGRAPHER_MAPPING_INTERNAL_MOTION_FILTER_H_

2
cartographer/internal/mapping/motion_filter_test.cc → cartographer/mapping/internal/motion_filter_test.cc
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "cartographer/internal/mapping/motion_filter.h"
#include "cartographer/mapping/internal/motion_filter.h"
#include "cartographer/common/lua_parameter_dictionary_test_helpers.h"
#include "gmock/gmock.h"

2
cartographer/internal/mapping/test_helpers.cc → cartographer/mapping/internal/test_helpers.cc
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "cartographer/internal/mapping/test_helpers.h"
#include "cartographer/mapping/internal/test_helpers.h"
#include "cartographer/common/config.h"
#include "cartographer/common/configuration_file_resolver.h"

6
cartographer/internal/mapping/test_helpers.h → cartographer/mapping/internal/test_helpers.h
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef CARTOGRAPHER_INTERNAL_MAPPING_TEST_HELPERS_H_
#define CARTOGRAPHER_INTERNAL_MAPPING_TEST_HELPERS_H_
#ifndef CARTOGRAPHER_MAPPING_INTERNAL_TEST_HELPERS_H_
#define CARTOGRAPHER_MAPPING_INTERNAL_TEST_HELPERS_H_
#include <memory>
@ -37,4 +37,4 @@ GenerateFakeRangeMeasurements(double travel_distance, double duration,
} // namespace mapping
} // namespace cartographer
#endif // CARTOGRAPHER_INTERNAL_MAPPING_TEST_HELPERS_H_
#endif // CARTOGRAPHER_MAPPING_INTERNAL_TEST_HELPERS_H_

6
cartographer/mapping/map_builder.cc
View File

@ -24,10 +24,10 @@
#include "cartographer/common/make_unique.h"
#include "cartographer/common/time.h"
#include "cartographer/internal/mapping/2d/local_trajectory_builder_2d.h"
#include "cartographer/internal/mapping/3d/local_trajectory_builder_3d.h"
#include "cartographer/internal/mapping/global_trajectory_builder.h"
#include "cartographer/mapping/collated_trajectory_builder.h"
#include "cartographer/mapping/internal/2d/local_trajectory_builder_2d.h"
#include "cartographer/mapping/internal/3d/local_trajectory_builder_3d.h"
#include "cartographer/mapping/internal/global_trajectory_builder.h"
#include "cartographer/sensor/collator.h"
#include "cartographer/sensor/range_data.h"
#include "cartographer/sensor/trajectory_collator.h"

2
cartographer/mapping/map_builder_test.cc
View File

@ -21,7 +21,7 @@
#include <vector>
#include "cartographer/common/config.h"
#include "cartographer/internal/mapping/test_helpers.h"
#include "cartographer/mapping/internal/test_helpers.h"
#include "cartographer/mapping/trajectory_builder_interface.h"
#include "gtest/gtest.h"

2
cartographer_grpc/client_server_test.cc
View File

@ -17,7 +17,7 @@
#include <condition_variable>
#include <mutex>
#include "cartographer/internal/mapping/test_helpers.h"
#include "cartographer/mapping/internal/test_helpers.h"
#include "cartographer/mapping/local_slam_result_data.h"
#include "cartographer_grpc/map_builder_server.h"
#include "cartographer_grpc/map_builder_server_options.h"