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.

Sign up for GitHub

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

build(detected_object_validation): move header files to a separate directory to avoid conflicts #5851

Merged
merged 9 commits into from
Dec 14, 2023
Merged

build(detected_object_validation): move header files to a separate directory to avoid conflicts #5851

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
526fc19
build(detected_object_validation): move header files to a separate di…
esteve Dec 12, 2023
5c4648d
style(pre-commit): autofix
pre-commit-ci[bot] Dec 12, 2023
48ac58d
fix: disable lint checks for header guards
esteve Dec 14, 2023
2a35360
fix: use NOLINT to disable lint checks
esteve Dec 14, 2023
495098e
fix: use NOLINTNEXTLINE
esteve Dec 14, 2023
82265b4
style(pre-commit): autofix
pre-commit-ci[bot] Dec 14, 2023
55600c9
fix: be more specific about the type of lint check to skip
esteve Dec 14, 2023
cb2b1f6
style(pre-commit): autofix
pre-commit-ci[bot] Dec 14, 2023
c96242b
fix: use NOLINTNEXTLINE
esteve Dec 14, 2023
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
8 changes: 4 additions & 4 deletions ...d_object_filter/object_lanelet_filter.hpp → ...d_object_filter/object_lanelet_filter.hpp
View file
Open in desktop
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 DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_
#define DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_
#ifndef DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_
#define DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_

#include "utils/utils.hpp"
#include "detected_object_validation/utils/utils.hpp"

#include <rclcpp/rclcpp.hpp>
#include <tier4_autoware_utils/geometry/geometry.hpp>
Expand Down Expand Up @@ -69,4 +69,4 @@ class ObjectLaneletFilterNode : public rclcpp::Node

} // namespace object_lanelet_filter

#endif // DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_
#endif // DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_
8 changes: 4 additions & 4 deletions ..._object_filter/object_position_filter.hpp → ..._object_filter/object_position_filter.hpp
View file
Open in desktop
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 DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_
#define DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_
#ifndef DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_
#define DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_

#include "utils/utils.hpp"
#include "detected_object_validation/utils/utils.hpp"

#include <rclcpp/rclcpp.hpp>
#include <tier4_autoware_utils/geometry/geometry.hpp>
Expand Down Expand Up @@ -55,4 +55,4 @@ class ObjectPositionFilterNode : public rclcpp::Node

} // namespace object_position_filter

#endif // DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_
#endif // DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_
6 changes: 3 additions & 3 deletions ...e_pointcloud_based_validator/debugger.hpp → ...e_pointcloud_based_validator/debugger.hpp
View file
Open in desktop
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 OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_
#define OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_
#ifndef DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_
#define DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_

#include <rclcpp/rclcpp.hpp>

Expand Down Expand Up @@ -113,4 +113,4 @@ class Debugger
};
} // namespace obstacle_pointcloud_based_validator

#endif // OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_
#endif // DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_
8 changes: 4 additions & 4 deletions ...r/obstacle_pointcloud_based_validator.hpp → ...r/obstacle_pointcloud_based_validator.hpp
View file
Open in desktop
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 OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_
#define OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_
#ifndef DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_
#define DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_

#include "obstacle_pointcloud_based_validator/debugger.hpp"
#include "detected_object_validation/obstacle_pointcloud_based_validator/debugger.hpp"

#include <rclcpp/rclcpp.hpp>

Expand Down Expand Up @@ -152,4 +152,4 @@ class ObstaclePointCloudBasedValidator : public rclcpp::Node
};
} // namespace obstacle_pointcloud_based_validator

#endif // OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_
#endif // DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_
6 changes: 3 additions & 3 deletions ...idator/occupancy_grid_based_validator.hpp → ...idator/occupancy_grid_based_validator.hpp
View file
Open in desktop
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 OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_
#define OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_
#ifndef DETECTED_OBJECT_VALIDATION__OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_
#define DETECTED_OBJECT_VALIDATION__OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_

#include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc/imgproc.hpp>
Expand Down Expand Up @@ -68,4 +68,4 @@ class OccupancyGridBasedValidator : public rclcpp::Node
};
} // namespace occupancy_grid_based_validator

#endif // OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_
#endif // DETECTED_OBJECT_VALIDATION__OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_
6 changes: 3 additions & 3 deletions ...object_validation/include/utils/utils.hpp → ...etected_object_validation/utils/utils.hpp
View file
Open in desktop
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 UTILS__UTILS_HPP_
#define UTILS__UTILS_HPP_
#ifndef DETECTED_OBJECT_VALIDATION__UTILS__UTILS_HPP_
#define DETECTED_OBJECT_VALIDATION__UTILS__UTILS_HPP_

#include <cstdint>

Expand All @@ -33,4 +33,4 @@ struct FilterTargetLabel
}; // struct FilterTargetLabel
} // namespace utils

#endif // UTILS__UTILS_HPP_
#endif // DETECTED_OBJECT_VALIDATION__UTILS__UTILS_HPP_
2 changes: 1 addition & 1 deletion perception/detected_object_validation/src/object_lanelet_filter.cpp
View file
Open in desktop
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 "detected_object_filter/object_lanelet_filter.hpp"
#include "detected_object_validation/detected_object_filter/object_lanelet_filter.hpp"

#include <lanelet2_extension/utility/message_conversion.hpp>
#include <lanelet2_extension/utility/query.hpp>
Expand Down
2 changes: 1 addition & 1 deletion perception/detected_object_validation/src/object_position_filter.cpp
View file
Open in desktop
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 "detected_object_filter/object_position_filter.hpp"
#include "detected_object_validation/detected_object_filter/object_position_filter.hpp"

namespace object_position_filter
{
Expand Down
2 changes: 1 addition & 1 deletion perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp
View file
Open in desktop
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 "obstacle_pointcloud_based_validator/obstacle_pointcloud_based_validator.hpp"
#include "detected_object_validation/obstacle_pointcloud_based_validator/obstacle_pointcloud_based_validator.hpp"

#include <object_recognition_utils/object_recognition_utils.hpp>
#include <tier4_autoware_utils/geometry/boost_polygon_utils.hpp>
Expand Down
2 changes: 1 addition & 1 deletion perception/detected_object_validation/src/occupancy_grid_based_validator.cpp
View file
Open in desktop
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 "occupancy_grid_based_validator/occupancy_grid_based_validator.hpp"
#include "detected_object_validation/occupancy_grid_based_validator/occupancy_grid_based_validator.hpp"

#include <object_recognition_utils/object_classification.hpp>
#include <object_recognition_utils/object_recognition_utils.hpp>
Expand Down
2 changes: 1 addition & 1 deletion perception/detected_object_validation/src/utils.cpp
View file
Open in desktop
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 "utils/utils.hpp"
#include "detected_object_validation/utils/utils.hpp"

#include <autoware_auto_perception_msgs/msg/object_classification.hpp>

Expand Down
Loading