Skip to content

Commit 4ea5019

Browse files
authored
Remove unused params (#14)
1 parent dda3a22 commit 4ea5019

File tree

5 files changed

+2
-22
lines changed

5 files changed

+2
-22
lines changed

roadmap_explorer/params/exploration_params.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ roadmap_explorer_node:
4242
add_yaw_to_tsp: false
4343
add_distance_to_robot_to_tsp: false
4444

45-
goalHysteresis:
46-
use_euclidean_distance: false
47-
use_roadmap_planner_distance: true
48-
4945
explorationBT:
5046
bt_sleep_ms: 70
5147
exploration_boundary: [310.0, 260.0, 310.0, -120.0, -70.0, -120.0, -70.0, 260.0]

roadmap_explorer/params/tb3_exploration_params.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ roadmap_explorer_node:
4242
add_yaw_to_tsp: false
4343
add_distance_to_robot_to_tsp: false
4444

45-
goalHysteresis:
46-
use_euclidean_distance: false
47-
use_roadmap_planner_distance: true
48-
4945
explorationBT:
5046
bt_sleep_ms: 70
5147
exploration_boundary: [310.0, 260.0, 310.0, -120.0, -70.0, -120.0, -70.0, 260.0]

roadmap_explorer/src/ExplorationBT.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ bool RoadmapExplorationBT::incrementFrontierSearchDistance()
8585
double increment_value = parameterInstance.getValue<double>("frontierSearch.increment_search_distance_by");
8686
LOG_WARN("Incrementing frontier search distance by " << increment_value);
8787
auto distance_to_set = current_frontier_search_distance + increment_value;
88-
if (distance_to_set > parameterInstance.getValue<double>("frontierSearch.max_permissible_frontier_search_distance")) {
88+
if (distance_to_set > parameterInstance.getValue<double>("frontierSearch.max_permissable_frontier_search_distance")) {
8989
return false;
9090
}
9191
blackboard->set<double>("current_frontier_search_distance", distance_to_set);

roadmap_explorer/src/Parameters.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,6 @@ void ParameterHandler::makeParameters(std::shared_ptr<nav2_util::LifecycleNode>
9292
parameter_map_["fullPathOptimizer.add_distance_to_robot_to_tsp"] = node->get_parameter(
9393
"fullPathOptimizer.add_distance_to_robot_to_tsp").as_bool();
9494

95-
// --- goalHysteresis ---
96-
nav2_util::declare_parameter_if_not_declared(
97-
node, "goalHysteresis.use_euclidean_distance", rclcpp::ParameterValue(
98-
false));
99-
nav2_util::declare_parameter_if_not_declared(
100-
node, "goalHysteresis.use_roadmap_planner_distance", rclcpp::ParameterValue(
101-
true));
102-
103-
parameter_map_["goalHysteresis.use_euclidean_distance"] = node->get_parameter(
104-
"goalHysteresis.use_euclidean_distance").as_bool();
105-
parameter_map_["goalHysteresis.use_roadmap_planner_distance"] = node->get_parameter(
106-
"goalHysteresis.use_roadmap_planner_distance").as_bool();
107-
10895
// --- explorationBT ---
10996
nav2_util::declare_parameter_if_not_declared(
11097
node, "explorationBT.bt_sleep_ms", rclcpp::ParameterValue(

roadmap_explorer/src/bt_plugins/SearchForFrontiersPlugin.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ namespace roadmap_explorer
3636
LOG_INFO("Using robot pose: " << robotP.pose.position.x << ", " << robotP.pose.position.y);
3737
std::vector<FrontierPtr> frontier_list;
3838
auto current_frontier_search_distance = config().blackboard->get<double>("current_frontier_search_distance");
39+
LOG_HIGHLIGHT("Current frontier search distance: " << current_frontier_search_distance);
3940
auto searchResult = frontierSearchPtr_->searchFrom(robotP.pose.position, frontier_list, current_frontier_search_distance);
4041
if (searchResult != FrontierSearchResult::SUCCESSFUL_SEARCH)
4142
{

0 commit comments

Comments
 (0)