Skip to content

Commit 22f542f

Browse files
compiles
Signed-off-by: stevedanomodolor <stevedan.o.omodolor@gmail.com>
1 parent bb6e63c commit 22f542f

File tree

5 files changed

+3
-16
lines changed

5 files changed

+3
-16
lines changed

nav2_smac_planner/include/nav2_smac_planner/a_star.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,6 @@ class AStarAlgorithm
249249
*/
250250
inline void clearGraph();
251251

252-
inline bool onVisitationCheckNode(const NodePtr & node);
253-
254252
/**
255253
* @brief Check if node has been visited
256254
* @param current_node Node to check if visited

nav2_smac_planner/include/nav2_smac_planner/analytic_expansion.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class AnalyticExpansion
3838
typedef std::vector<NodePtr> NodeVector;
3939
typedef typename NodeT::Coordinates Coordinates;
4040
typedef std::function<bool (const uint64_t &, NodeT * &)> NodeGetter;
41+
typedef typename NodeT::CoordinateVector CoordinateVector;
4142

4243
/**
4344
* @struct nav2_smac_planner::AnalyticExpansion::AnalyticExpansionNodes

nav2_smac_planner/include/nav2_smac_planner/smac_planner_hybrid.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ class SmacPlannerHybrid : public nav2_core::GlobalPlanner
124124
std::string _motion_model_for_search;
125125
MotionModel _motion_model;
126126
GoalHeadingMode _goal_heading_mode;
127+
int _coarse_search_resolution;
127128
rclcpp_lifecycle::LifecyclePublisher<nav_msgs::msg::Path>::SharedPtr _raw_plan_publisher;
128129
rclcpp_lifecycle::LifecyclePublisher<visualization_msgs::msg::MarkerArray>::SharedPtr
129130
_planned_footprints_publisher;

nav2_smac_planner/include/nav2_smac_planner/smac_planner_lattice.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ class SmacPlannerLattice : public nav2_core::GlobalPlanner
121121
rclcpp_lifecycle::LifecyclePublisher<geometry_msgs::msg::PoseArray>::SharedPtr
122122
_expansions_publisher;
123123
GoalHeadingMode _goal_heading_mode;
124+
int _coarse_search_resolution;
124125
std::mutex _mutex;
125126
rclcpp_lifecycle::LifecycleNode::WeakPtr _node;
126127

nav2_smac_planner/test/test_a_star.cpp

-14
Original file line numberDiff line numberDiff line change
@@ -568,20 +568,6 @@ TEST(AStarTest, test_constants)
568568
nav2_smac_planner::fromStringToGH("NONE"), nav2_smac_planner::GoalHeadingMode::UNKNOWN);
569569
}
570570

571-
572-
int main(int argc, char **argv)
573-
{
574-
::testing::InitGoogleTest(&argc, argv);
575-
576-
rclcpp::init(0, nullptr);
577-
578-
int result = RUN_ALL_TESTS();
579-
580-
rclcpp::shutdown();
581-
582-
return result;
583-
}
584-
585571
int main(int argc, char **argv)
586572
{
587573
::testing::InitGoogleTest(&argc, argv);

0 commit comments

Comments
 (0)