Skip to content

Commit 3684f1a

Browse files
committed
feat: change function names
Signed-off-by: Berkay Karaman <brkay54@gmail.com>
1 parent 2c34cbf commit 3684f1a

8 files changed

+184
-212
lines changed

tools/reaction_analyzer/include/reaction_analyzer_node.hpp

+16-28
Original file line numberDiff line numberDiff line change
@@ -159,45 +159,33 @@ class ReactionAnalyzerNode : public rclcpp::Node
159159
size_t test_iteration_count_{0};
160160

161161
// Functions
162-
void initAnalyzerVariables();
163-
164-
void initPointcloud();
165-
166-
void initPredictedObjects();
167-
168-
void initEgoForTest(
162+
void init_analyzer_variables();
163+
void init_pointcloud();
164+
void init_predicted_objects();
165+
void init_ego(
169166
const LocalizationInitializationState::ConstSharedPtr & initialization_state_ptr,
170167
const RouteState::ConstSharedPtr & route_state_ptr,
171168
const OperationModeState::ConstSharedPtr & operation_mode_ptr,
172169
const PoseStamped::ConstSharedPtr & ground_truth_pose_ptr,
173170
const Odometry::ConstSharedPtr & odometry_ptr);
174-
175-
void callOperationModeServiceWithoutResponse();
176-
177-
void spawnObstacle(const geometry_msgs::msg::Point & ego_pose);
178-
179-
void calculateResults(
171+
void call_operation_mode_service_without_response();
172+
void spawn_obstacle(const geometry_msgs::msg::Point & ego_pose);
173+
void calculate_results(
180174
const std::unordered_map<std::string, subscriber::BufferVariant> & message_buffers,
181175
const rclcpp::Time & spawn_cmd_time);
182-
183-
void onTimer();
184-
185-
void dummyPerceptionPublisher();
186-
176+
void on_timer();
177+
void dummy_perception_publisher();
187178
void reset();
188-
189-
void writeResultsToFile();
179+
void write_results();
190180

191181
// Callbacks
192-
void vehiclePoseCallback(Odometry::ConstSharedPtr msg_ptr);
193-
194-
void initializationStateCallback(LocalizationInitializationState::ConstSharedPtr msg_ptr);
195-
196-
void routeStateCallback(RouteState::ConstSharedPtr msg_ptr);
197-
198-
void operationModeCallback(OperationModeState::ConstSharedPtr msg_ptr);
182+
void on_vehicle_pose(Odometry::ConstSharedPtr msg_ptr);
183+
void on_localization_initialization_state(
184+
LocalizationInitializationState::ConstSharedPtr msg_ptr);
185+
void on_route_state(RouteState::ConstSharedPtr msg_ptr);
186+
void on_operation_mode_state(OperationModeState::ConstSharedPtr msg_ptr);
187+
void on_ground_truth_pose(PoseStamped::ConstSharedPtr msg_ptr);
199188

200-
void groundTruthPoseCallback(PoseStamped::ConstSharedPtr msg_ptr);
201189
// Timer
202190
rclcpp::TimerBase::SharedPtr timer_;
203191
rclcpp::TimerBase::SharedPtr dummy_perception_timer_;

tools/reaction_analyzer/include/subscriber.hpp

+20-38
Original file line numberDiff line numberDiff line change
@@ -188,59 +188,41 @@ class SubscriberBase
188188
std::shared_ptr<tf2_ros::TransformListener> tf_listener_;
189189

190190
// Functions
191-
void initReactionChainsAndParams();
192-
193-
bool initSubscribers();
194-
195-
bool searchPointcloudNearEntity(const pcl::PointCloud<pcl::PointXYZ> & pcl_pointcloud);
196-
197-
bool searchPredictedObjectsNearEntity(const PredictedObjects & predicted_objects);
198-
199-
bool searchDetectedObjectsNearEntity(const DetectedObjects & detected_objects);
200-
201-
bool searchTrackedObjectsNearEntity(const TrackedObjects & tracked_objects);
202-
203-
void setControlCommandToBuffer(
191+
void init_reaction_chains_and_params();
192+
bool init_subscribers();
193+
bool search_pointcloud_near_entity(const pcl::PointCloud<pcl::PointXYZ> & pcl_pointcloud);
194+
bool search_predicted_objects_near_entity(const PredictedObjects & predicted_objects);
195+
bool search_detected_objects_near_entity(const DetectedObjects & detected_objects);
196+
bool search_tracked_objects_near_entity(const TrackedObjects & tracked_objects);
197+
void set_control_command_to_buffer(
204198
std::vector<AckermannControlCommand> & buffer, const AckermannControlCommand & cmd);
205-
206-
std::optional<size_t> findFirstBrakeIdx(const std::vector<AckermannControlCommand> & cmd_array);
199+
std::optional<size_t> find_first_brake_idx(
200+
const std::vector<AckermannControlCommand> & cmd_array);
207201

208202
// Callbacks for modules are subscribed
209-
void controlCommandOutputCallback(
203+
void on_control_command(
210204
const std::string & node_name, const AckermannControlCommand::ConstSharedPtr & msg_ptr);
211-
212-
void trajectoryOutputCallback(
213-
const std::string & node_name, const Trajectory::ConstSharedPtr & msg_ptr);
214-
215-
void trajectoryOutputCallback(
205+
void on_trajectory(const std::string & node_name, const Trajectory::ConstSharedPtr & msg_ptr);
206+
void on_trajectory(
216207
const std::string & node_name, const Trajectory::ConstSharedPtr & msg_ptr,
217208
const PublishedTime::ConstSharedPtr & published_time_ptr);
218-
219-
void pointcloud2OutputCallback(
220-
const std::string & node_name, const PointCloud2::ConstSharedPtr & msg_ptr);
221-
222-
void pointcloud2OutputCallback(
209+
void on_pointcloud(const std::string & node_name, const PointCloud2::ConstSharedPtr & msg_ptr);
210+
void on_pointcloud(
223211
const std::string & node_name, const PointCloud2::ConstSharedPtr & msg_ptr,
224212
const PublishedTime::ConstSharedPtr & published_time_ptr);
225-
226-
void predictedObjectsOutputCallback(
213+
void on_predicted_objects(
227214
const std::string & node_name, const PredictedObjects::ConstSharedPtr & msg_ptr);
228-
229-
void predictedObjectsOutputCallback(
215+
void on_predicted_objects(
230216
const std::string & node_name, const PredictedObjects::ConstSharedPtr & msg_ptr,
231217
const PublishedTime::ConstSharedPtr & published_time_ptr);
232-
233-
void detectedObjectsOutputCallback(
218+
void on_detected_objects(
234219
const std::string & node_name, const DetectedObjects::ConstSharedPtr & msg_ptr);
235-
236-
void detectedObjectsOutputCallback(
220+
void on_detected_objects(
237221
const std::string & node_name, const DetectedObjects::ConstSharedPtr & msg_ptr,
238222
const PublishedTime::ConstSharedPtr & published_time_ptr);
239-
240-
void trackedObjectsOutputCallback(
223+
void on_tracked_objects(
241224
const std::string & node_name, const TrackedObjects::ConstSharedPtr & msg_ptr);
242-
243-
void trackedObjectsOutputCallback(
225+
void on_tracked_objects(
244226
const std::string & node_name, const TrackedObjects::ConstSharedPtr & msg_ptr,
245227
const PublishedTime::ConstSharedPtr & published_time_ptr);
246228
};

tools/reaction_analyzer/include/topic_publisher.hpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ struct PublisherVarAccessor
130130
};
131131

132132
template <typename MessageType>
133-
void publishWithCurrentTime(
133+
void publish_with_current_time(
134134
const PublisherVariables<MessageType> & publisherVar, const rclcpp::Time & current_time,
135135
const bool is_object_spawned) const
136136
{
@@ -150,25 +150,25 @@ struct PublisherVarAccessor
150150
}
151151

152152
template <typename T>
153-
void setPeriod(T & publisherVar, double newPeriod)
153+
void set_period(T & publisherVar, double newPeriod)
154154
{
155155
publisherVar.period_ns = newPeriod;
156156
}
157157

158158
template <typename T>
159-
double getPeriod(const T & publisherVar) const
159+
double get_period(const T & publisherVar) const
160160
{
161161
return publisherVar.period_ns;
162162
}
163163

164164
template <typename T>
165-
std::shared_ptr<void> getEmptyAreaMessage(const T & publisherVar) const
165+
std::shared_ptr<void> get_empty_area_message(const T & publisherVar) const
166166
{
167167
return std::static_pointer_cast<void>(publisherVar.empty_area_message);
168168
}
169169

170170
template <typename T>
171-
std::shared_ptr<void> getObjectSpawnedMessage(const T & publisherVar) const
171+
std::shared_ptr<void> get_object_spawned_message(const T & publisherVar) const
172172
{
173173
return std::static_pointer_cast<void>(publisherVar.object_spawned_message);
174174
}
@@ -213,20 +213,20 @@ class TopicPublisher
213213
TopicPublisherParams topic_publisher_params_;
214214

215215
// Functions
216-
void setMessageToVariableMap(
216+
void set_message_to_variable_map(
217217
const PublisherMessageType & message_type, const std::string & topic_name,
218218
rosbag2_storage::SerializedBagMessage & bag_message, const bool is_empty_area_message);
219-
void setPeriodToVariableMap(
219+
void set_period_to_variable_map(
220220
const std::unordered_map<std::string, std::vector<rclcpp::Time>> & time_map);
221-
bool setPublishersAndTimersToVariableMap();
222-
bool checkPublishersInitializedCorrectly();
223-
void initRosbagPublishers();
224-
void pointcloudMessagesSyncPublisher(const PointcloudPublisherType type);
225-
void genericMessagePublisher(const std::string & topic_name);
226-
void pointcloudMessagesAsyncPublisher(
221+
bool set_publishers_and_timers_to_variable_map();
222+
bool check_publishers_initialized_correctly();
223+
void init_rosbag_publishers();
224+
void pointcloud_messages_sync_publisher(const PointcloudPublisherType type);
225+
void pointcloud_messages_async_publisher(
227226
const std::pair<
228227
std::shared_ptr<PublisherVariables<PointCloud2>>,
229228
std::shared_ptr<PublisherVariables<PointCloud2>>> & lidar_output_pair_);
229+
void generic_message_publisher(const std::string & topic_name);
230230

231231
// Variables
232232
PointcloudPublisherType pointcloud_publisher_type_;

tools/reaction_analyzer/include/utils.hpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ using autoware_auto_planning_msgs::msg::TrajectoryPoint;
3838
* @return A vector of tuples. Each tuple contains a string (the test name), a vector of doubles
3939
* (the test results), and a double (the median value).
4040
*/
41-
std::vector<std::tuple<std::string, std::vector<double>, double>> sortResultsByMedian(
41+
std::vector<std::tuple<std::string, std::vector<double>, double>> sort_results_by_median(
4242
const std::unordered_map<std::string, std::vector<double>> test_results);
4343

4444
/**
@@ -47,7 +47,7 @@ std::vector<std::tuple<std::string, std::vector<double>, double>> sortResultsByM
4747
* @param node A pointer to the node for which the subscription options are being created.
4848
* @return The created SubscriptionOptions.
4949
*/
50-
rclcpp::SubscriptionOptions createSubscriptionOptions(rclcpp::Node * node);
50+
rclcpp::SubscriptionOptions create_subscription_options(rclcpp::Node * node);
5151

5252
/**
5353
* @brief Splits a string by a given delimiter.
@@ -72,7 +72,8 @@ std::vector<std::string> split(const std::string & str, char delimiter);
7272
* @return The index of the point in the trajectory that is at least the specified distance away
7373
* from the current point.
7474
*/
75-
size_t getIndexAfterDistance(const Trajectory & traj, const size_t curr_id, const double distance);
75+
size_t get_index_after_distance(
76+
const Trajectory & traj, const size_t curr_id, const double distance);
7677
} // namespace reaction_analyzer
7778

7879
#endif // UTILS_HPP_

0 commit comments

Comments
 (0)