Skip to content

Commit

Permalink
refactor: update include statements in tracking_object_merger module
Browse files Browse the repository at this point in the history
Signed-off-by: Taekjin LEE <[email protected]>
  • Loading branch information
technolojin committed Jun 25, 2024
1 parent 55284d8 commit 1134289
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 45 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
// Author: v1.0 Yukihiro Saito
//

#ifndef AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_

#define EIGEN_MPL2_ONLY

#include "autoware/tracking_object_merger/association/solver/gnn_solver.hpp"
#include "autoware/tracking_object_merger/utils/tracker_state.hpp"
#include "autoware_tracking_object_merger/association/solver/gnn_solver.hpp"
#include "autoware_tracking_object_merger/utils/tracker_state.hpp"

#include <Eigen/Core>
#include <Eigen/Geometry>
Expand Down Expand Up @@ -72,4 +72,4 @@ class DataAssociation

} // namespace autoware::tracking_object_merger

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

#ifndef AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_

#include "autoware/tracking_object_merger/association/solver/gnn_solver_interface.hpp"
#include "autoware/tracking_object_merger/association/solver/mu_ssp.hpp"
#include "autoware/tracking_object_merger/association/solver/ssp.hpp"
#include "autoware_tracking_object_merger/association/solver/gnn_solver_interface.hpp"
#include "autoware_tracking_object_merger/association/solver/mu_ssp.hpp"
#include "autoware_tracking_object_merger/association/solver/ssp.hpp"

#endif // AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#endif // AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_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__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_

#include <unordered_map>
#include <vector>
Expand All @@ -32,4 +32,4 @@ class GnnSolverInterface
};
} // namespace autoware::tracking_object_merger::gnn_solver

#endif // AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#endif // AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_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__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_

#include "autoware/tracking_object_merger/association/solver/gnn_solver_interface.hpp"
#include "autoware_tracking_object_merger/association/solver/gnn_solver_interface.hpp"

#include <unordered_map>
#include <vector>
Expand All @@ -34,4 +34,4 @@ class MuSSP : public GnnSolverInterface
};
} // namespace autoware::tracking_object_merger::gnn_solver

#endif // AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#endif // AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_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__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_

#include "autoware/tracking_object_merger/association/solver/gnn_solver_interface.hpp"
#include "autoware_tracking_object_merger/association/solver/gnn_solver_interface.hpp"

#include <unordered_map>
#include <vector>
Expand All @@ -34,4 +34,4 @@ class SSP : public GnnSolverInterface
};
} // namespace autoware::tracking_object_merger::gnn_solver

#endif // AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
#endif // AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
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.

#ifndef AUTOWARE__TRACKING_OBJECT_MERGER__DECORATIVE_TRACKER_MERGER_NODE_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__DECORATIVE_TRACKER_MERGER_NODE_HPP_
#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__DECORATIVE_TRACKER_MERGER_NODE_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__DECORATIVE_TRACKER_MERGER_NODE_HPP_

#include "autoware/tracking_object_merger/association/data_association.hpp"
#include "autoware/tracking_object_merger/utils/tracker_state.hpp"
#include "autoware/tracking_object_merger/utils/utils.hpp"
#include "autoware/universe_utils/ros/debug_publisher.hpp"
#include "autoware/universe_utils/ros/published_time_publisher.hpp"
#include "autoware/universe_utils/system/stop_watch.hpp"
#include "autoware_tracking_object_merger/association/data_association.hpp"
#include "autoware_tracking_object_merger/utils/tracker_state.hpp"
#include "autoware_tracking_object_merger/utils/utils.hpp"

#include <rclcpp/rclcpp.hpp>

Expand Down Expand Up @@ -133,4 +133,4 @@ class DecorativeTrackerMergerNode : public rclcpp::Node

} // namespace autoware::tracking_object_merger

#endif // AUTOWARE__TRACKING_OBJECT_MERGER__DECORATIVE_TRACKER_MERGER_NODE_HPP_
#endif // AUTOWARE_TRACKING_OBJECT_MERGER__DECORATIVE_TRACKER_MERGER_NODE_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__TRACKING_OBJECT_MERGER__UTILS__TRACKER_STATE_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__UTILS__TRACKER_STATE_HPP_
#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__UTILS__TRACKER_STATE_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__UTILS__TRACKER_STATE_HPP_

#include <Eigen/Core>
#include <Eigen/Geometry>
Expand Down Expand Up @@ -149,4 +149,4 @@ TrackedObjects getTrackedObjectsFromTrackerStates(
std::vector<TrackerState> & tracker_states, const rclcpp::Time & time);
} // namespace autoware::tracking_object_merger

#endif // AUTOWARE__TRACKING_OBJECT_MERGER__UTILS__TRACKER_STATE_HPP_
#endif // AUTOWARE_TRACKING_OBJECT_MERGER__UTILS__TRACKER_STATE_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
//
//

#ifndef AUTOWARE__TRACKING_OBJECT_MERGER__UTILS__UTILS_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__UTILS__UTILS_HPP_
#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__UTILS__UTILS_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__UTILS__UTILS_HPP_

// #include <autoware/universe_utils/autoware_universe_utils.hpp>
#include "autoware/universe_utils/geometry/geometry.hpp"
Expand Down Expand Up @@ -101,4 +101,4 @@ void updateWholeTrackedObject(TrackedObject & main_obj, const TrackedObject & su

} // namespace autoware::tracking_object_merger

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

#include "autoware/tracking_object_merger/association/data_association.hpp"
#include "autoware_tracking_object_merger/association/data_association.hpp"

#include "autoware/tracking_object_merger/association/solver/gnn_solver.hpp"
#include "autoware/tracking_object_merger/utils/utils.hpp"
#include "autoware/universe_utils/geometry/geometry.hpp"
#include "autoware_tracking_object_merger/association/solver/gnn_solver.hpp"
#include "autoware_tracking_object_merger/utils/utils.hpp"
#include "object_recognition_utils/object_recognition_utils.hpp"

#include <algorithm>
Expand Down
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/tracking_object_merger/association/solver/mu_ssp.hpp"
#include "autoware_tracking_object_merger/association/solver/mu_ssp.hpp"

#include <mussp/mussp.h>

Expand Down
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/tracking_object_merger/association/solver/ssp.hpp"
#include "autoware_tracking_object_merger/association/solver/ssp.hpp"

#include <algorithm>
#include <cassert>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

#define EIGEN_MPL2_ONLY

#include "autoware/tracking_object_merger/decorative_tracker_merger_node.hpp"
#include "autoware_tracking_object_merger/decorative_tracker_merger_node.hpp"

#include "autoware/tracking_object_merger/association/solver/ssp.hpp"
#include "autoware/tracking_object_merger/utils/utils.hpp"
#include "autoware_tracking_object_merger/association/solver/ssp.hpp"
#include "autoware_tracking_object_merger/utils/utils.hpp"
#include "object_recognition_utils/object_recognition_utils.hpp"

#include <Eigen/Core>
Expand Down
4 changes: 2 additions & 2 deletions perception/tracking_object_merger/src/utils/tracker_state.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/tracking_object_merger/utils/tracker_state.hpp"
#include "autoware_tracking_object_merger/utils/tracker_state.hpp"

#include "autoware/tracking_object_merger/utils/utils.hpp"
#include "autoware_tracking_object_merger/utils/utils.hpp"

namespace autoware::tracking_object_merger
{
Expand Down
2 changes: 1 addition & 1 deletion perception/tracking_object_merger/src/utils/utils.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/tracking_object_merger/utils/utils.hpp"
#include "autoware_tracking_object_merger/utils/utils.hpp"

#include "autoware_perception_msgs/msg/shape.hpp"
#include "autoware_perception_msgs/msg/tracked_object.hpp"
Expand Down

0 comments on commit 1134289

Please sign in to comment.