Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(pose_initializer): apply static analysis #7355

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ template <class NodeT>
std::array<double, 36> get_covariance_parameter(NodeT * node, const std::string & name)
{
const auto parameter = node->template declare_parameter<std::vector<double>>(name);
std::array<double, 36> covariance;
std::array<double, 36> covariance{};
copy_vector_to_array(parameter, covariance);
return covariance;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,18 @@

#include <memory>

GnssModule::GnssModule(rclcpp::Node * node) : fitter_(node)
GnssModule::GnssModule(rclcpp::Node * node)
: fitter_(node),
clock_(node->get_clock()),
timeout_(node->declare_parameter<double>("gnss_pose_timeout"))
{
sub_gnss_pose_ = node->create_subscription<PoseWithCovarianceStamped>(
"gnss_pose_cov", 1, [this](PoseWithCovarianceStamped::ConstSharedPtr msg) { pose_ = msg; });
"gnss_pose_cov", 1, std::bind(&GnssModule::on_pose, this, std::placeholders::_1));
}

clock_ = node->get_clock();
timeout_ = node->declare_parameter<double>("gnss_pose_timeout");
void GnssModule::on_pose(PoseWithCovarianceStamped::ConstSharedPtr msg)
{
pose_ = msg;
}

geometry_msgs::msg::PoseWithCovarianceStamped GnssModule::get_pose()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ class GnssModule
PoseWithCovarianceStamped get_pose();

private:
void on_pose(PoseWithCovarianceStamped::ConstSharedPtr msg);

map_height_fitter::MapHeightFitter fitter_;
rclcpp::Clock::SharedPtr clock_;
rclcpp::Subscription<PoseWithCovarianceStamped>::SharedPtr sub_gnss_pose_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ using ServiceException = component_interface_utils::ServiceException;
using Initialize = localization_interface::Initialize;
using PoseWithCovarianceStamped = geometry_msgs::msg::PoseWithCovarianceStamped;

NdtModule::NdtModule(rclcpp::Node * node) : logger_(node->get_logger())
NdtModule::NdtModule(rclcpp::Node * node)
: logger_(node->get_logger()), cli_align_(node->create_client<RequestPoseAlignment>("ndt_align"))
{
cli_align_ = node->create_client<RequestPoseAlignment>("ndt_align");
}

PoseWithCovarianceStamped NdtModule::align_pose(const PoseWithCovarianceStamped & pose)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2022 The Autoware Contributors

Check notice on line 1 in localization/pose_initializer/src/pose_initializer/pose_initializer_core.cpp

View check run for this annotation

CodeScene Delta Analysis / CodeScene Cloud Delta Analysis (main)

✅ No longer an issue: Overall Code Complexity

The mean cyclomatic complexity in this module is no longer above the threshold
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -67,28 +67,24 @@
throw std::invalid_argument(
"Could not set user defined initial pose. The size of initial_pose is " +
std::to_string(initial_pose_array.size()) + ". It must be 7.");
} else if (
}
if (
std::abs(initial_pose_array[3]) < 1e-6 && std::abs(initial_pose_array[4]) < 1e-6 &&
std::abs(initial_pose_array[5]) < 1e-6 && std::abs(initial_pose_array[6]) < 1e-6) {
throw std::invalid_argument("Input quaternion is invalid. All elements are close to zero.");
} else {
geometry_msgs::msg::Pose initial_pose;
initial_pose.position.x = initial_pose_array[0];
initial_pose.position.y = initial_pose_array[1];
initial_pose.position.z = initial_pose_array[2];
initial_pose.orientation.x = initial_pose_array[3];
initial_pose.orientation.y = initial_pose_array[4];
initial_pose.orientation.z = initial_pose_array[5];
initial_pose.orientation.w = initial_pose_array[6];

set_user_defined_initial_pose(initial_pose, true);
}
}
}

PoseInitializer::~PoseInitializer()
{
// to delete gnss module
geometry_msgs::msg::Pose initial_pose;
initial_pose.position.x = initial_pose_array[0];
initial_pose.position.y = initial_pose_array[1];
initial_pose.position.z = initial_pose_array[2];
initial_pose.orientation.x = initial_pose_array[3];
initial_pose.orientation.y = initial_pose_array[4];
initial_pose.orientation.z = initial_pose_array[5];
initial_pose.orientation.w = initial_pose_array[6];

set_user_defined_initial_pose(initial_pose, true);
}
}

void PoseInitializer::change_state(State::Message::_state_type state)
Expand Down Expand Up @@ -175,7 +171,7 @@
std::stringstream message;
message << "No input pose_with_covariance. If you want to use DIRECT method, please input "
"pose_with_covariance.";
RCLCPP_ERROR(get_logger(), message.str().c_str());
RCLCPP_ERROR_STREAM(get_logger(), message.str());
throw ServiceException(
autoware_common_msgs::msg::ResponseStatus::PARAMETER_ERROR, message.str());
}
Expand All @@ -186,7 +182,7 @@
} else {
std::stringstream message;
message << "Unknown method type (=" << std::to_string(req->method) << ")";
RCLCPP_ERROR(get_logger(), message.str().c_str());
RCLCPP_ERROR_STREAM(get_logger(), message.str());
throw ServiceException(
autoware_common_msgs::msg::ResponseStatus::PARAMETER_ERROR, message.str());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ class PoseInitializer : public rclcpp::Node
{
public:
explicit PoseInitializer(const rclcpp::NodeOptions & options);
~PoseInitializer();

private:
using ServiceException = component_interface_utils::ServiceException;
Expand All @@ -48,8 +47,8 @@ class PoseInitializer : public rclcpp::Node
component_interface_utils::Publisher<State>::SharedPtr pub_state_;
component_interface_utils::Service<Initialize>::SharedPtr srv_initialize_;
State::Message state_;
std::array<double, 36> output_pose_covariance_;
std::array<double, 36> gnss_particle_covariance_;
std::array<double, 36> output_pose_covariance_{};
std::array<double, 36> gnss_particle_covariance_{};
std::unique_ptr<GnssModule> gnss_;
std::unique_ptr<NdtModule> ndt_;
std::unique_ptr<YabLocModule> yabloc_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ using ServiceException = component_interface_utils::ServiceException;
using Initialize = localization_interface::Initialize;
using PoseWithCovarianceStamped = geometry_msgs::msg::PoseWithCovarianceStamped;

YabLocModule::YabLocModule(rclcpp::Node * node) : logger_(node->get_logger())
YabLocModule::YabLocModule(rclcpp::Node * node)
: logger_(node->get_logger()), cli_align_(node->create_client<RequestPoseAlignment>("yabloc_align"))
{
cli_align_ = node->create_client<RequestPoseAlignment>("yabloc_align");
}

PoseWithCovarianceStamped YabLocModule::align_pose(const PoseWithCovarianceStamped & pose)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
TEST(CopyVectorToArray, CopyAllElements)
{
const std::vector<int> vector{0, 1, 2, 3, 4};
std::array<int, 5> array;
std::array<int, 5> array{};
copy_vector_to_array<int, 5>(vector, array);
EXPECT_THAT(array, testing::ElementsAre(0, 1, 2, 3, 4));
}
Expand All @@ -28,15 +28,15 @@ TEST(CopyVectorToArray, CopyZeroElements)
{
const std::vector<int> vector{};
// just confirm that this works
std::array<int, 0> array;
std::array<int, 0> array{};
copy_vector_to_array<int, 0>(vector, array);
}

TEST(CopyVectorToArray, ThrowsInvalidArgumentIfMoreElementsExpected)
{
auto f = [] {
const std::vector<int> vector{0, 1, 2, 3, 4};
std::array<int, 6> array;
std::array<int, 6> array{};
copy_vector_to_array<int, 6>(vector, array);
};

Expand Down
Loading