From 6f07dbae8100057bd58af46d8ca211803fc36ccb Mon Sep 17 00:00:00 2001 From: Aaron Xiao Date: Sun, 15 Dec 2019 07:47:32 -0800 Subject: [PATCH] Prediction: Remove unused std headers. --- modules/prediction/common/feature_output.cc | 2 -- modules/prediction/common/message_process.cc | 5 ----- modules/prediction/common/message_process.h | 1 - modules/prediction/common/prediction_thread_pool.h | 3 --- modules/prediction/common/prediction_thread_pool_test.cc | 2 -- modules/prediction/common/semantic_map.cc | 2 -- modules/prediction/container/obstacles/obstacle.cc | 2 -- .../prediction/container/obstacles/obstacles_container.cc | 2 -- .../prediction/container/obstacles/obstacles_container.h | 1 - modules/prediction/evaluator/evaluator_manager.cc | 2 -- .../pedestrian/pedestrian_interaction_evaluator.cc | 1 - .../evaluator/pedestrian/pedestrian_interaction_evaluator.h | 1 - modules/prediction/evaluator/vehicle/cruise_mlp_evaluator.h | 1 - .../prediction/evaluator/vehicle/junction_map_evaluator.h | 1 - .../prediction/evaluator/vehicle/junction_mlp_evaluator.h | 1 - .../evaluator/vehicle/lane_aggregating_evaluator.cc | 1 - .../evaluator/vehicle/lane_aggregating_evaluator.h | 2 -- .../prediction/evaluator/vehicle/lane_scanning_evaluator.cc | 1 - .../prediction/evaluator/vehicle/lane_scanning_evaluator.h | 1 - modules/prediction/evaluator/vehicle/mlp_evaluator.h | 1 - .../prediction/evaluator/vehicle/semantic_lstm_evaluator.cc | 1 - .../prediction/evaluator/vehicle/semantic_lstm_evaluator.h | 1 - modules/prediction/prediction_component.cc | 3 --- modules/prediction/prediction_component.h | 1 - .../predictor/extrapolation/extrapolation_predictor.h | 2 -- .../prediction/predictor/free_move/free_move_predictor.cc | 2 -- .../predictor/interaction/interaction_predictor.cc | 1 - modules/prediction/predictor/predictor_manager.cc | 1 - modules/prediction/predictor/sequence/sequence_predictor.cc | 1 - .../scenario/prioritization/obstacles_prioritizer.cc | 2 -- modules/prediction/scenario/scenario_manager.cc | 2 -- modules/prediction/scenario/scenario_manager.h | 6 ------ modules/prediction/submodules/evaluator_submodule.cc | 2 -- modules/prediction/submodules/predictor_submodule.cc | 4 ---- modules/prediction/submodules/predictor_submodule.h | 2 +- 35 files changed, 1 insertion(+), 63 deletions(-) diff --git a/modules/prediction/common/feature_output.cc b/modules/prediction/common/feature_output.cc index 5715f08987..5a2b7ad063 100644 --- a/modules/prediction/common/feature_output.cc +++ b/modules/prediction/common/feature_output.cc @@ -16,8 +16,6 @@ #include "modules/prediction/common/feature_output.h" -#include - #include "absl/strings/str_cat.h" #include "cyber/common/file.h" #include "modules/prediction/common/prediction_system_gflags.h" diff --git a/modules/prediction/common/message_process.cc b/modules/prediction/common/message_process.cc index d46b4cd545..5c9e6a2029 100644 --- a/modules/prediction/common/message_process.cc +++ b/modules/prediction/common/message_process.cc @@ -16,11 +16,6 @@ #include "modules/prediction/common/message_process.h" -#include -#include -#include -#include - #include "cyber/common/file.h" #include "cyber/record/record_reader.h" diff --git a/modules/prediction/common/message_process.h b/modules/prediction/common/message_process.h index 21ea33c881..1c300bf2f8 100644 --- a/modules/prediction/common/message_process.h +++ b/modules/prediction/common/message_process.h @@ -20,7 +20,6 @@ #pragma once -#include #include #include "modules/localization/proto/localization.pb.h" diff --git a/modules/prediction/common/prediction_thread_pool.h b/modules/prediction/common/prediction_thread_pool.h index 429ff7c835..d786538d37 100644 --- a/modules/prediction/common/prediction_thread_pool.h +++ b/modules/prediction/common/prediction_thread_pool.h @@ -20,11 +20,8 @@ #pragma once -#include #include -#include #include -#include #include #include diff --git a/modules/prediction/common/prediction_thread_pool_test.cc b/modules/prediction/common/prediction_thread_pool_test.cc index 54f48f21e7..ef3c4146fd 100644 --- a/modules/prediction/common/prediction_thread_pool_test.cc +++ b/modules/prediction/common/prediction_thread_pool_test.cc @@ -16,8 +16,6 @@ #include "modules/prediction/common/prediction_thread_pool.h" -#include - #include "gtest/gtest.h" namespace apollo { diff --git a/modules/prediction/common/semantic_map.cc b/modules/prediction/common/semantic_map.cc index c17dc27064..070a6b9374 100644 --- a/modules/prediction/common/semantic_map.cc +++ b/modules/prediction/common/semantic_map.cc @@ -16,8 +16,6 @@ #include "modules/prediction/common/semantic_map.h" -#include -#include #include #include diff --git a/modules/prediction/container/obstacles/obstacle.cc b/modules/prediction/container/obstacles/obstacle.cc index f03a601f4d..67ad2edbd7 100644 --- a/modules/prediction/container/obstacles/obstacle.cc +++ b/modules/prediction/container/obstacles/obstacle.cc @@ -19,8 +19,6 @@ #include #include #include -#include -#include #include "modules/prediction/common/junction_analyzer.h" #include "modules/prediction/container/obstacles/obstacle_clusters.h" diff --git a/modules/prediction/container/obstacles/obstacles_container.cc b/modules/prediction/container/obstacles/obstacles_container.cc index 54f1c08596..e353485ca5 100644 --- a/modules/prediction/container/obstacles/obstacles_container.cc +++ b/modules/prediction/container/obstacles/obstacles_container.cc @@ -17,8 +17,6 @@ #include "modules/prediction/container/obstacles/obstacles_container.h" #include -#include -#include #include #include "modules/prediction/common/feature_output.h" diff --git a/modules/prediction/container/obstacles/obstacles_container.h b/modules/prediction/container/obstacles/obstacles_container.h index 8c358db591..034748719a 100644 --- a/modules/prediction/container/obstacles/obstacles_container.h +++ b/modules/prediction/container/obstacles/obstacles_container.h @@ -23,7 +23,6 @@ #include #include -#include #include #include "modules/common/util/lru_cache.h" diff --git a/modules/prediction/evaluator/evaluator_manager.cc b/modules/prediction/evaluator/evaluator_manager.cc index bd94946c31..a12ec4915c 100644 --- a/modules/prediction/evaluator/evaluator_manager.cc +++ b/modules/prediction/evaluator/evaluator_manager.cc @@ -17,8 +17,6 @@ #include "modules/prediction/evaluator/evaluator_manager.h" #include -#include -#include #include "modules/common/configs/vehicle_config_helper.h" #include "modules/prediction/common/feature_output.h" diff --git a/modules/prediction/evaluator/pedestrian/pedestrian_interaction_evaluator.cc b/modules/prediction/evaluator/pedestrian/pedestrian_interaction_evaluator.cc index 69baa2d94b..54abf4b9b0 100644 --- a/modules/prediction/evaluator/pedestrian/pedestrian_interaction_evaluator.cc +++ b/modules/prediction/evaluator/pedestrian/pedestrian_interaction_evaluator.cc @@ -17,7 +17,6 @@ #include "modules/prediction/evaluator/pedestrian/pedestrian_interaction_evaluator.h" #include -#include #include "modules/common/math/vec2d.h" #include "modules/prediction/common/feature_output.h" diff --git a/modules/prediction/evaluator/pedestrian/pedestrian_interaction_evaluator.h b/modules/prediction/evaluator/pedestrian/pedestrian_interaction_evaluator.h index 3acd991633..d325c47e95 100644 --- a/modules/prediction/evaluator/pedestrian/pedestrian_interaction_evaluator.h +++ b/modules/prediction/evaluator/pedestrian/pedestrian_interaction_evaluator.h @@ -21,7 +21,6 @@ #pragma once -#include #include #include #include diff --git a/modules/prediction/evaluator/vehicle/cruise_mlp_evaluator.h b/modules/prediction/evaluator/vehicle/cruise_mlp_evaluator.h index a51a336bc9..1df618544e 100644 --- a/modules/prediction/evaluator/vehicle/cruise_mlp_evaluator.h +++ b/modules/prediction/evaluator/vehicle/cruise_mlp_evaluator.h @@ -16,7 +16,6 @@ #pragma once -#include #include #include diff --git a/modules/prediction/evaluator/vehicle/junction_map_evaluator.h b/modules/prediction/evaluator/vehicle/junction_map_evaluator.h index df8d1bad14..01eb7bbbc8 100644 --- a/modules/prediction/evaluator/vehicle/junction_map_evaluator.h +++ b/modules/prediction/evaluator/vehicle/junction_map_evaluator.h @@ -16,7 +16,6 @@ #pragma once -#include #include #include diff --git a/modules/prediction/evaluator/vehicle/junction_mlp_evaluator.h b/modules/prediction/evaluator/vehicle/junction_mlp_evaluator.h index 1b7c53a46e..6c8f91d1c6 100644 --- a/modules/prediction/evaluator/vehicle/junction_mlp_evaluator.h +++ b/modules/prediction/evaluator/vehicle/junction_mlp_evaluator.h @@ -16,7 +16,6 @@ #pragma once -#include #include #include diff --git a/modules/prediction/evaluator/vehicle/lane_aggregating_evaluator.cc b/modules/prediction/evaluator/vehicle/lane_aggregating_evaluator.cc index 87c0cb4c3f..17fbba3102 100644 --- a/modules/prediction/evaluator/vehicle/lane_aggregating_evaluator.cc +++ b/modules/prediction/evaluator/vehicle/lane_aggregating_evaluator.cc @@ -18,7 +18,6 @@ #include #include -#include #include "modules/common/math/vec2d.h" #include "modules/prediction/common/feature_output.h" diff --git a/modules/prediction/evaluator/vehicle/lane_aggregating_evaluator.h b/modules/prediction/evaluator/vehicle/lane_aggregating_evaluator.h index 7cb69a0a0e..a7aa5824e0 100644 --- a/modules/prediction/evaluator/vehicle/lane_aggregating_evaluator.h +++ b/modules/prediction/evaluator/vehicle/lane_aggregating_evaluator.h @@ -21,9 +21,7 @@ #pragma once -#include #include -#include #include #include "torch/script.h" diff --git a/modules/prediction/evaluator/vehicle/lane_scanning_evaluator.cc b/modules/prediction/evaluator/vehicle/lane_scanning_evaluator.cc index 7d3acdf59e..cf1f7d5a48 100644 --- a/modules/prediction/evaluator/vehicle/lane_scanning_evaluator.cc +++ b/modules/prediction/evaluator/vehicle/lane_scanning_evaluator.cc @@ -19,7 +19,6 @@ #include #include -#include #include #include "cyber/common/file.h" diff --git a/modules/prediction/evaluator/vehicle/lane_scanning_evaluator.h b/modules/prediction/evaluator/vehicle/lane_scanning_evaluator.h index bcc0a17ae7..89755114ad 100644 --- a/modules/prediction/evaluator/vehicle/lane_scanning_evaluator.h +++ b/modules/prediction/evaluator/vehicle/lane_scanning_evaluator.h @@ -16,7 +16,6 @@ #pragma once -#include #include #include diff --git a/modules/prediction/evaluator/vehicle/mlp_evaluator.h b/modules/prediction/evaluator/vehicle/mlp_evaluator.h index 407ac3a2af..946a7c282a 100644 --- a/modules/prediction/evaluator/vehicle/mlp_evaluator.h +++ b/modules/prediction/evaluator/vehicle/mlp_evaluator.h @@ -18,7 +18,6 @@ #include #include -#include #include #include "modules/prediction/container/obstacles/obstacles_container.h" diff --git a/modules/prediction/evaluator/vehicle/semantic_lstm_evaluator.cc b/modules/prediction/evaluator/vehicle/semantic_lstm_evaluator.cc index 1cedb2cd4d..a045f3942d 100644 --- a/modules/prediction/evaluator/vehicle/semantic_lstm_evaluator.cc +++ b/modules/prediction/evaluator/vehicle/semantic_lstm_evaluator.cc @@ -17,7 +17,6 @@ #include "modules/prediction/evaluator/vehicle/semantic_lstm_evaluator.h" #include -#include #include "Eigen/Dense" diff --git a/modules/prediction/evaluator/vehicle/semantic_lstm_evaluator.h b/modules/prediction/evaluator/vehicle/semantic_lstm_evaluator.h index 9ebaf1d656..a385df101a 100644 --- a/modules/prediction/evaluator/vehicle/semantic_lstm_evaluator.h +++ b/modules/prediction/evaluator/vehicle/semantic_lstm_evaluator.h @@ -16,7 +16,6 @@ #pragma once -#include #include #include #include diff --git a/modules/prediction/prediction_component.cc b/modules/prediction/prediction_component.cc index caac670760..f76326eb39 100644 --- a/modules/prediction/prediction_component.cc +++ b/modules/prediction/prediction_component.cc @@ -16,9 +16,6 @@ #include "modules/prediction/prediction_component.h" -#include -#include - #include "cyber/common/file.h" #include "cyber/record/record_reader.h" #include "modules/common/adapters/adapter_gflags.h" diff --git a/modules/prediction/prediction_component.h b/modules/prediction/prediction_component.h index def4700c27..da7aaec1f9 100644 --- a/modules/prediction/prediction_component.h +++ b/modules/prediction/prediction_component.h @@ -22,7 +22,6 @@ #include #include -#include #include "absl/time/time.h" diff --git a/modules/prediction/predictor/extrapolation/extrapolation_predictor.h b/modules/prediction/predictor/extrapolation/extrapolation_predictor.h index fa10828acc..91de0b2ca3 100644 --- a/modules/prediction/predictor/extrapolation/extrapolation_predictor.h +++ b/modules/prediction/predictor/extrapolation/extrapolation_predictor.h @@ -22,8 +22,6 @@ #pragma once #include -#include -#include #include "modules/prediction/predictor/sequence/sequence_predictor.h" diff --git a/modules/prediction/predictor/free_move/free_move_predictor.cc b/modules/prediction/predictor/free_move/free_move_predictor.cc index f2f3d9348b..30f9114981 100644 --- a/modules/prediction/predictor/free_move/free_move_predictor.cc +++ b/modules/prediction/predictor/free_move/free_move_predictor.cc @@ -16,8 +16,6 @@ #include "modules/prediction/predictor/free_move/free_move_predictor.h" -#include - #include "modules/prediction/common/prediction_gflags.h" #include "modules/prediction/common/prediction_util.h" #include "modules/prediction/proto/prediction_conf.pb.h" diff --git a/modules/prediction/predictor/interaction/interaction_predictor.cc b/modules/prediction/predictor/interaction/interaction_predictor.cc index 876022acb6..9b185e6e5f 100644 --- a/modules/prediction/predictor/interaction/interaction_predictor.cc +++ b/modules/prediction/predictor/interaction/interaction_predictor.cc @@ -20,7 +20,6 @@ #include #include #include -#include #include "modules/common/adapters/proto/adapter_config.pb.h" #include "modules/prediction/common/feature_output.h" diff --git a/modules/prediction/predictor/predictor_manager.cc b/modules/prediction/predictor/predictor_manager.cc index 0f260a566b..b66cc1f8fd 100644 --- a/modules/prediction/predictor/predictor_manager.cc +++ b/modules/prediction/predictor/predictor_manager.cc @@ -17,7 +17,6 @@ #include "modules/prediction/predictor/predictor_manager.h" #include -#include #include #include "modules/prediction/common/feature_output.h" diff --git a/modules/prediction/predictor/sequence/sequence_predictor.cc b/modules/prediction/predictor/sequence/sequence_predictor.cc index 8a0725caa0..fa21e83cbe 100644 --- a/modules/prediction/predictor/sequence/sequence_predictor.cc +++ b/modules/prediction/predictor/sequence/sequence_predictor.cc @@ -18,7 +18,6 @@ #include #include -#include #include "modules/common/proto/geometry.pb.h" #include "modules/prediction/common/prediction_gflags.h" diff --git a/modules/prediction/scenario/prioritization/obstacles_prioritizer.cc b/modules/prediction/scenario/prioritization/obstacles_prioritizer.cc index df6d3f198a..3a2e3c8f2b 100644 --- a/modules/prediction/scenario/prioritization/obstacles_prioritizer.cc +++ b/modules/prediction/scenario/prioritization/obstacles_prioritizer.cc @@ -16,9 +16,7 @@ #include "modules/prediction/scenario/prioritization/obstacles_prioritizer.h" -#include #include -#include #include #include #include diff --git a/modules/prediction/scenario/scenario_manager.cc b/modules/prediction/scenario/scenario_manager.cc index a343536d88..cb252a93e8 100644 --- a/modules/prediction/scenario/scenario_manager.cc +++ b/modules/prediction/scenario/scenario_manager.cc @@ -16,8 +16,6 @@ #include "modules/prediction/scenario/scenario_manager.h" -#include - #include "modules/prediction/common/prediction_gflags.h" namespace apollo { diff --git a/modules/prediction/scenario/scenario_manager.h b/modules/prediction/scenario/scenario_manager.h index 2a08b9bc74..1653d0952c 100644 --- a/modules/prediction/scenario/scenario_manager.h +++ b/modules/prediction/scenario/scenario_manager.h @@ -14,14 +14,8 @@ * limitations under the License. *****************************************************************************/ -/** - * @file - */ - #pragma once -#include - #include "modules/prediction/container/obstacles/obstacles_container.h" #include "modules/prediction/scenario/analyzer/scenario_analyzer.h" #include "modules/prediction/scenario/feature_extractor/feature_extractor.h" diff --git a/modules/prediction/submodules/evaluator_submodule.cc b/modules/prediction/submodules/evaluator_submodule.cc index 0910a4d7f0..8a85910ddd 100644 --- a/modules/prediction/submodules/evaluator_submodule.cc +++ b/modules/prediction/submodules/evaluator_submodule.cc @@ -14,8 +14,6 @@ * limitations under the License. *****************************************************************************/ -#include - #include "modules/prediction/submodules/evaluator_submodule.h" #include "modules/common/adapters/adapter_gflags.h" diff --git a/modules/prediction/submodules/predictor_submodule.cc b/modules/prediction/submodules/predictor_submodule.cc index b543a8ce9b..acc479165d 100644 --- a/modules/prediction/submodules/predictor_submodule.cc +++ b/modules/prediction/submodules/predictor_submodule.cc @@ -16,8 +16,6 @@ #include "modules/prediction/submodules/predictor_submodule.h" -#include - #include "absl/time/time.h" #include "modules/common/adapters/adapter_gflags.h" @@ -33,8 +31,6 @@ namespace prediction { using apollo::common::time::Clock; using apollo::perception::PerceptionObstacles; -PredictorSubmodule::~PredictorSubmodule() {} - std::string PredictorSubmodule::Name() const { return FLAGS_evaluator_submodule_name; } diff --git a/modules/prediction/submodules/predictor_submodule.h b/modules/prediction/submodules/predictor_submodule.h index 5ba432c5db..5cec5475e1 100644 --- a/modules/prediction/submodules/predictor_submodule.h +++ b/modules/prediction/submodules/predictor_submodule.h @@ -39,7 +39,7 @@ class PredictorSubmodule /** * @brief Destructor */ - ~PredictorSubmodule(); + ~PredictorSubmodule() = default; /** * @brief Get name of the node -- GitLab