-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Add condition nodes for time and distance replanning #1705
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.
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
Merged
SteveMacenski
merged 9 commits into
ros-navigation:master
from
naiveHobo:feature/is-new-goal-condition
May 27, 2020
Merged
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
cf39a54
Add condition nodes and behavior tree to enable replan on new goal
naiveHobo da73f76
Fix time expired and distance traveled conditions
naiveHobo 363f974
Remove new_goal_received from blackboard
naiveHobo da6f5b2
Fix IDLE check condition in new condition nodes
naiveHobo 24d39ba
Fix lint errors
naiveHobo 19c8c4f
Fix lint errors
naiveHobo e0d2305
Address reviewer's comments
naiveHobo ce4b7dc
Add tests
naiveHobo de0f797
Merge branch 'master' of github.com:ros-planning/navigation2 into fea…
naiveHobo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
Add condition nodes and behavior tree to enable replan on new goal
Signed-off-by: Sarthak Mittal <sarthakmittal2608@gmail.com>
- Loading branch information
commit cf39a5457d4d6696ae1955a4332b7db5f3a1dbaf
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
nav2_behavior_tree/plugins/condition/distance_traveled_condition.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| // Copyright (c) 2019 Intel Corporation | ||
| // Copyright (c) 2020 Sarthak Mittal | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #ifndef NAV2_BEHAVIOR_TREE__DISTANCE_TRAVELED_CONDITION_HPP_ | ||
| #define NAV2_BEHAVIOR_TREE__DISTANCE_TRAVELED_CONDITION_HPP_ | ||
|
|
||
| #include <string> | ||
| #include <memory> | ||
|
|
||
| #include "rclcpp/rclcpp.hpp" | ||
| #include "behaviortree_cpp_v3/condition_node.h" | ||
| #include "nav2_util/robot_utils.hpp" | ||
| #include "geometry_msgs/msg/pose_stamped.hpp" | ||
| #include "tf2_ros/buffer.h" | ||
|
|
||
| namespace nav2_behavior_tree | ||
| { | ||
|
|
||
| class DistanceTraveledCondition : public BT::ConditionNode | ||
| { | ||
| public: | ||
| DistanceTraveledCondition( | ||
| const std::string & condition_name, | ||
| const BT::NodeConfiguration & conf) | ||
| : BT::ConditionNode(condition_name, conf), | ||
| distance_(1.0), | ||
| first_time_(true) | ||
| { | ||
| getInput("distance", distance_); | ||
| node_ = config().blackboard->get<rclcpp::Node::SharedPtr>("node"); | ||
| tf_ = config().blackboard->get<std::shared_ptr<tf2_ros::Buffer>>("tf_buffer"); | ||
| } | ||
|
|
||
| DistanceTraveledCondition() = delete; | ||
|
|
||
| BT::NodeStatus tick() override | ||
| { | ||
| if (first_time_) { | ||
| if (!nav2_util::getCurrentPose(start_pose_, *tf_)) { | ||
| RCLCPP_DEBUG(node_->get_logger(), "Current robot pose is not available."); | ||
| return BT::NodeStatus::FAILURE; | ||
| } | ||
| first_time_ = false; | ||
| return BT::NodeStatus::SUCCESS; | ||
| } | ||
|
|
||
| // Determine distance travelled since we've started this iteration | ||
| geometry_msgs::msg::PoseStamped current_pose; | ||
| if (!nav2_util::getCurrentPose(current_pose, *tf_)) { | ||
| RCLCPP_DEBUG(node_->get_logger(), "Current robot pose is not available."); | ||
| return BT::NodeStatus::FAILURE; | ||
| } | ||
|
|
||
| // Get euclidean distance | ||
| auto travelled = euclidean_distance(start_pose_, current_pose); | ||
|
|
||
| if (travelled < distance_) { | ||
| return BT::NodeStatus::FAILURE; | ||
| } | ||
|
|
||
| // Update start pose | ||
| start_pose_ = current_pose; | ||
|
|
||
| return BT::NodeStatus::SUCCESS; | ||
| } | ||
|
|
||
| static BT::PortsList providedPorts() | ||
| { | ||
| return { | ||
| BT::InputPort<double>("distance", 1.0, "Distance") | ||
| }; | ||
| } | ||
|
|
||
| private: | ||
| double euclidean_distance( | ||
naiveHobo marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| const geometry_msgs::msg::PoseStamped & pose1, | ||
| const geometry_msgs::msg::PoseStamped & pose2) | ||
| { | ||
| const double dx = pose1.pose.position.x - pose2.pose.position.x; | ||
| const double dy = pose1.pose.position.y - pose2.pose.position.y; | ||
| const double dz = pose1.pose.position.z - pose2.pose.position.z; | ||
| return std::sqrt(dx * dx + dy * dy + dz * dz); | ||
| } | ||
|
|
||
| rclcpp::Node::SharedPtr node_; | ||
| std::shared_ptr<tf2_ros::Buffer> tf_; | ||
|
|
||
| geometry_msgs::msg::PoseStamped start_pose_; | ||
|
|
||
| double distance_; | ||
| bool first_time_; | ||
| }; | ||
|
|
||
| } // namespace nav2_behavior_tree | ||
|
|
||
| #include "behaviortree_cpp_v3/bt_factory.h" | ||
| BT_REGISTER_NODES(factory) | ||
| { | ||
| factory.registerNodeType<nav2_behavior_tree::DistanceTraveledCondition>("DistanceTraveled"); | ||
| } | ||
|
|
||
| #endif // NAV2_BEHAVIOR_TREE__DISTANCE_TRAVELED_CONDITION_HPP_ | ||
89 changes: 89 additions & 0 deletions
89
nav2_behavior_tree/plugins/condition/time_expired_condition.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| // Copyright (c) 2019 Intel Corporation | ||
| // Copyright (c) 2020 Sarthak Mittal | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #ifndef NAV2_BEHAVIOR_TREE__TIME_EXPIRED_CONDITION_HPP_ | ||
| #define NAV2_BEHAVIOR_TREE__TIME_EXPIRED_CONDITION_HPP_ | ||
|
|
||
| #include <chrono> | ||
| #include <string> | ||
|
|
||
| #include "behaviortree_cpp_v3/condition_node.h" | ||
|
|
||
| namespace nav2_behavior_tree | ||
| { | ||
|
|
||
| class TimeExpiredCondition : public BT::ConditionNode | ||
| { | ||
| public: | ||
| TimeExpiredCondition( | ||
| const std::string & condition_name, | ||
| const BT::NodeConfiguration & conf) | ||
| : BT::ConditionNode(condition_name, conf), | ||
| first_time_(true) | ||
| { | ||
| double hz = 1.0; | ||
| getInput("hz", hz); | ||
| period_ = 1.0 / hz; | ||
| } | ||
|
|
||
| TimeExpiredCondition() = delete; | ||
|
|
||
| BT::NodeStatus tick() override | ||
| { | ||
| if (first_time_) { | ||
| start_ = std::chrono::high_resolution_clock::now(); | ||
| first_time_ = false; | ||
| return BT::NodeStatus::SUCCESS; | ||
| } | ||
|
|
||
| // Determine how long its been since we've started this iteration | ||
| auto now = std::chrono::high_resolution_clock::now(); | ||
naiveHobo marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| auto elapsed = now - start_; | ||
|
|
||
| // Now, get that in seconds | ||
| typedef std::chrono::duration<float> float_seconds; | ||
| auto seconds = std::chrono::duration_cast<float_seconds>(elapsed); | ||
|
|
||
| if (seconds.count() < period_) { | ||
| return BT::NodeStatus::FAILURE; | ||
| } | ||
|
|
||
| start_ = std::chrono::high_resolution_clock::now(); // Reset the timer | ||
| return BT::NodeStatus::SUCCESS; | ||
| } | ||
|
|
||
| // Any BT node that accepts parameters must provide a requiredNodeParameters method | ||
| static BT::PortsList providedPorts() | ||
| { | ||
| return { | ||
| BT::InputPort<double>("hz", 10.0, "Rate") | ||
| }; | ||
| } | ||
|
|
||
| private: | ||
| std::chrono::time_point<std::chrono::high_resolution_clock> start_; | ||
| double period_; | ||
| bool first_time_; | ||
| }; | ||
|
|
||
| } // namespace nav2_behavior_tree | ||
|
|
||
| #include "behaviortree_cpp_v3/bt_factory.h" | ||
| BT_REGISTER_NODES(factory) | ||
| { | ||
| factory.registerNodeType<nav2_behavior_tree::TimeExpiredCondition>("TimeExpired"); | ||
| } | ||
|
|
||
| #endif // NAV2_BEHAVIOR_TREE__TIME_EXPIRED_CONDITION_HPP_ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you set to true first_time_ when the node is ticked and idle, then the node will get initialized again after being halted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, going to follow pretty much the thing you did in the GoalUpdated condition