Skip to content
Merged
1 change: 1 addition & 0 deletions localization/autoware_ekf_localizer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ find_package(Eigen3 REQUIRED)
include_directories(
SYSTEM
${EIGEN3_INCLUDE_DIR}
src/
)

ament_auto_find_build_dependencies()
Expand Down
4 changes: 2 additions & 2 deletions localization/autoware_ekf_localizer/src/covariance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "autoware/ekf_localizer/covariance.hpp"
#include "include/covariance.hpp"

#include "autoware/ekf_localizer/state_index.hpp"
#include "include/state_index.hpp"

#include <autoware_utils_geometry/msg/covariance.hpp>

Expand Down
2 changes: 1 addition & 1 deletion localization/autoware_ekf_localizer/src/diagnostics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "autoware/ekf_localizer/diagnostics.hpp"
#include "include/diagnostics.hpp"

#include <diagnostic_msgs/msg/diagnostic_status.hpp>

Expand Down
8 changes: 4 additions & 4 deletions localization/autoware_ekf_localizer/src/ekf_localizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "autoware/ekf_localizer/ekf_localizer.hpp"
#include "include/ekf_localizer.hpp"

#include "autoware/ekf_localizer/diagnostics.hpp"
#include "autoware/ekf_localizer/string.hpp"
#include "autoware/ekf_localizer/warning_message.hpp"
#include "autoware/localization_util/covariance_ellipse.hpp"
#include "include/diagnostics.hpp"
#include "include/string.hpp"
#include "include/warning_message.hpp"

#include <autoware_utils_geometry/geometry.hpp>
#include <autoware_utils_logging/logger_level_configure.hpp>
Expand Down
19 changes: 10 additions & 9 deletions localization/autoware_ekf_localizer/src/ekf_module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "autoware/ekf_localizer/ekf_module.hpp"
#include "include/ekf_module.hpp"

#include "autoware/ekf_localizer/covariance.hpp"
#include "autoware/ekf_localizer/mahalanobis.hpp"
#include "autoware/ekf_localizer/matrix_types.hpp"
#include "autoware/ekf_localizer/measurement.hpp"
#include "autoware/ekf_localizer/numeric.hpp"
#include "autoware/ekf_localizer/state_transition.hpp"
#include "autoware/ekf_localizer/warning_message.hpp"
#include "include/covariance.hpp"
#include "include/mahalanobis.hpp"
#include "include/matrix_types.hpp"
#include "include/measurement.hpp"
#include "include/numeric.hpp"
#include "include/state_transition.hpp"
#include "include/warning_message.hpp"

#include <autoware_utils_geometry/geometry.hpp>
#include <autoware_utils_geometry/msg/covariance.hpp>
Expand All @@ -44,7 +44,8 @@ EKFModule::EKFModule(std::shared_ptr<Warning> warning, const HyperParameters & p
dim_x_(6), // x, y, yaw, yaw_bias, vx, wz
accumulated_delay_times_(params.extend_state_step, 1.0E15),
params_(params),
last_angular_velocity_(0.0, 0.0, 0.0)
last_angular_velocity_(0.0, 0.0, 0.0),
ekf_dt_(0.0)
{
Eigen::MatrixXd x = Eigen::MatrixXd::Zero(dim_x_, 1);
Eigen::MatrixXd p = Eigen::MatrixXd::Identity(dim_x_, dim_x_) * 1.0E15; // for x & y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__AGED_OBJECT_QUEUE_HPP_
#define AUTOWARE__EKF_LOCALIZER__AGED_OBJECT_QUEUE_HPP_
#ifndef AGED_OBJECT_QUEUE_HPP_
#define AGED_OBJECT_QUEUE_HPP_

#include <cstddef>
#include <queue>
Expand Down Expand Up @@ -86,4 +86,4 @@ class AgedObjectQueue

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__AGED_OBJECT_QUEUE_HPP_
#endif // AGED_OBJECT_QUEUE_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__COVARIANCE_HPP_
#define AUTOWARE__EKF_LOCALIZER__COVARIANCE_HPP_
#ifndef COVARIANCE_HPP_
#define COVARIANCE_HPP_

#include "autoware/ekf_localizer/matrix_types.hpp"
#include "matrix_types.hpp"

namespace autoware::ekf_localizer
{
Expand All @@ -25,4 +25,4 @@ std::array<double, 36> ekf_covariance_to_twist_message_covariance(const Matrix6d

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__COVARIANCE_HPP_
#endif // COVARIANCE_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__DIAGNOSTICS_HPP_
#define AUTOWARE__EKF_LOCALIZER__DIAGNOSTICS_HPP_
#ifndef DIAGNOSTICS_HPP_
#define DIAGNOSTICS_HPP_

#include <diagnostic_msgs/msg/diagnostic_status.hpp>

Expand Down Expand Up @@ -46,4 +46,4 @@ diagnostic_msgs::msg::DiagnosticStatus merge_diagnostic_status(

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__DIAGNOSTICS_HPP_
#endif // DIAGNOSTICS_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__EKF_LOCALIZER_HPP_
#define AUTOWARE__EKF_LOCALIZER__EKF_LOCALIZER_HPP_
#ifndef EKF_LOCALIZER_HPP_
#define EKF_LOCALIZER_HPP_

#include "autoware/ekf_localizer/aged_object_queue.hpp"
#include "autoware/ekf_localizer/ekf_module.hpp"
#include "autoware/ekf_localizer/hyper_parameters.hpp"
#include "autoware/ekf_localizer/warning.hpp"
#include "aged_object_queue.hpp"
#include "ekf_module.hpp"
#include "hyper_parameters.hpp"
#include "warning.hpp"

#include <autoware_utils_logging/logger_level_configure.hpp>
#include <autoware_utils_system/stop_watch.hpp>
Expand Down Expand Up @@ -54,7 +54,7 @@ namespace autoware::ekf_localizer
class EKFLocalizer : public rclcpp::Node
{
public:
explicit EKFLocalizer(const rclcpp::NodeOptions & options);
explicit EKFLocalizer(const rclcpp::NodeOptions & node_options);

// This function is only used in static tools to know when timer callbacks are triggered.
std::chrono::nanoseconds time_until_trigger() const
Expand Down Expand Up @@ -194,4 +194,4 @@ class EKFLocalizer : public rclcpp::Node

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__EKF_LOCALIZER_HPP_
#endif // EKF_LOCALIZER_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__EKF_MODULE_HPP_
#define AUTOWARE__EKF_LOCALIZER__EKF_MODULE_HPP_
#ifndef EKF_MODULE_HPP_
#define EKF_MODULE_HPP_

#include "autoware/ekf_localizer/hyper_parameters.hpp"
#include "autoware/ekf_localizer/state_index.hpp"
#include "autoware/ekf_localizer/warning.hpp"
#include "hyper_parameters.hpp"
#include "state_index.hpp"
#include "warning.hpp"

#include <autoware/kalman_filter/kalman_filter.hpp>
#include <autoware/kalman_filter/time_delay_kalman_filter.hpp>
Expand Down Expand Up @@ -152,4 +152,4 @@ class EKFModule

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__EKF_MODULE_HPP_
#endif // EKF_MODULE_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__HYPER_PARAMETERS_HPP_
#define AUTOWARE__EKF_LOCALIZER__HYPER_PARAMETERS_HPP_
#ifndef HYPER_PARAMETERS_HPP_
#define HYPER_PARAMETERS_HPP_

#include <rclcpp/rclcpp.hpp>

Expand Down Expand Up @@ -109,4 +109,4 @@ class HyperParameters

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__HYPER_PARAMETERS_HPP_
#endif // HYPER_PARAMETERS_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__MAHALANOBIS_HPP_
#define AUTOWARE__EKF_LOCALIZER__MAHALANOBIS_HPP_
#ifndef MAHALANOBIS_HPP_
#define MAHALANOBIS_HPP_

#include <Eigen/Core>
#include <Eigen/Dense>
Expand All @@ -28,4 +28,4 @@ double mahalanobis(const Eigen::VectorXd & x, const Eigen::VectorXd & y, const E

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__MAHALANOBIS_HPP_
#endif // MAHALANOBIS_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__MATRIX_TYPES_HPP_
#define AUTOWARE__EKF_LOCALIZER__MATRIX_TYPES_HPP_
#ifndef MATRIX_TYPES_HPP_
#define MATRIX_TYPES_HPP_

#include <Eigen/Core>

Expand All @@ -25,4 +25,4 @@ using Matrix6d = Eigen::Matrix<double, 6, 6>;

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__MATRIX_TYPES_HPP_
#endif // MATRIX_TYPES_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__MEASUREMENT_HPP_
#define AUTOWARE__EKF_LOCALIZER__MEASUREMENT_HPP_
#ifndef MEASUREMENT_HPP_
#define MEASUREMENT_HPP_

#include <Eigen/Core>

Expand All @@ -29,4 +29,4 @@ Eigen::Matrix2d twist_measurement_covariance(

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__MEASUREMENT_HPP_
#endif // MEASUREMENT_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__NUMERIC_HPP_
#define AUTOWARE__EKF_LOCALIZER__NUMERIC_HPP_
#ifndef NUMERIC_HPP_
#define NUMERIC_HPP_

#include <Eigen/Core>

Expand All @@ -34,4 +34,4 @@ inline bool has_nan(const Eigen::MatrixXd & v)

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__NUMERIC_HPP_
#endif // NUMERIC_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__STATE_INDEX_HPP_
#define AUTOWARE__EKF_LOCALIZER__STATE_INDEX_HPP_
#ifndef STATE_INDEX_HPP_
#define STATE_INDEX_HPP_

namespace autoware::ekf_localizer
{
Expand All @@ -29,4 +29,4 @@ enum IDX {

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__STATE_INDEX_HPP_
#endif // STATE_INDEX_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__STATE_TRANSITION_HPP_
#define AUTOWARE__EKF_LOCALIZER__STATE_TRANSITION_HPP_
#ifndef STATE_TRANSITION_HPP_
#define STATE_TRANSITION_HPP_

#include "autoware/ekf_localizer/matrix_types.hpp"
#include "matrix_types.hpp"

namespace autoware::ekf_localizer
{
Expand All @@ -28,4 +28,4 @@ Matrix6d process_noise_covariance(

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__STATE_TRANSITION_HPP_
#endif // STATE_TRANSITION_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__STRING_HPP_
#define AUTOWARE__EKF_LOCALIZER__STRING_HPP_
#ifndef STRING_HPP_
#define STRING_HPP_

#include <string>

Expand All @@ -31,4 +31,4 @@ inline std::string erase_leading_slash(const std::string & s)

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__STRING_HPP_
#endif // STRING_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__WARNING_HPP_
#define AUTOWARE__EKF_LOCALIZER__WARNING_HPP_
#ifndef WARNING_HPP_
#define WARNING_HPP_

#include <rclcpp/rclcpp.hpp>

Expand Down Expand Up @@ -45,4 +45,4 @@ class Warning

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__WARNING_HPP_
#endif // WARNING_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE__EKF_LOCALIZER__WARNING_MESSAGE_HPP_
#define AUTOWARE__EKF_LOCALIZER__WARNING_MESSAGE_HPP_
#ifndef WARNING_MESSAGE_HPP_
#define WARNING_MESSAGE_HPP_

#include <string>

Expand All @@ -32,4 +32,4 @@ std::string too_slow_ekf_dt_waring_message(const double ekf_dt);

} // namespace autoware::ekf_localizer

#endif // AUTOWARE__EKF_LOCALIZER__WARNING_MESSAGE_HPP_
#endif // WARNING_MESSAGE_HPP_
2 changes: 1 addition & 1 deletion localization/autoware_ekf_localizer/src/mahalanobis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "autoware/ekf_localizer/mahalanobis.hpp"
#include "include/mahalanobis.hpp"

namespace autoware::ekf_localizer
{
Expand Down
4 changes: 2 additions & 2 deletions localization/autoware_ekf_localizer/src/measurement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "autoware/ekf_localizer/measurement.hpp"
#include "include/measurement.hpp"

#include "autoware/ekf_localizer/state_index.hpp"
#include "include/state_index.hpp"

#include <autoware_utils_geometry/msg/covariance.hpp>

Expand Down
Loading
Loading