forked from ros-navigation/navigation2
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Upgrade collision monitor #39
Open
RBT22
wants to merge
6
commits into
humble
Choose a base branch
from
upgrade-collision-monitor
base: humble
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1a6054b
Update to jazzy
RBT22 68d5e43
Add array parser
RBT22 df01905
Revert 1594 twist stamped publisher
RBT22 c88f04e
Add PolygonInstance messages to replace missing geometry_msgs
RBT22 b5bcf2f
Remove unused real-time priority configuration from collision monitor
RBT22 90a2a54
Revert timer creation mode change
RBT22 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
There are no files selected for viewing
This file contains 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,51 @@ | ||
/* | ||
* Copyright (c) 2012, Willow Garage, Inc. | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are met: | ||
* | ||
* * Redistributions of source code must retain the above copyright | ||
* notice, this list of conditions and the following disclaimer. | ||
* * Redistributions in binary form must reproduce the above copyright | ||
* notice, this list of conditions and the following disclaimer in the | ||
* documentation and/or other materials provided with the distribution. | ||
* * Neither the name of the Willow Garage, Inc. nor the names of its | ||
* contributors may be used to endorse or promote products derived from | ||
* this software without specific prior written permission. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
* POSSIBILITY OF SUCH DAMAGE. | ||
* | ||
* author: Dave Hershberger | ||
*/ | ||
#ifndef NAV2_UTIL__ARRAY_PARSER_HPP_ | ||
#define NAV2_UTIL__ARRAY_PARSER_HPP_ | ||
|
||
#include <vector> | ||
#include <string> | ||
|
||
namespace nav2_util | ||
{ | ||
|
||
/** @brief Parse a vector of vectors of floats from a string. | ||
* @param error_return If no error, error_return is set to "". If | ||
* error, error_return will describe the error. | ||
* Syntax is [[1.0, 2.0], [3.3, 4.4, 5.5], ...] | ||
* | ||
* On error, error_return is set and the return value could be | ||
* anything, like part of a successful parse. */ | ||
std::vector<std::vector<float>> parseVVF(const std::string & input, std::string & error_return); | ||
|
||
} // end namespace nav2_util | ||
|
||
#endif // NAV2_UTIL__ARRAY_PARSER_HPP_ |
This file contains 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 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,105 @@ | ||
/* | ||
* Copyright (c) 2012, Willow Garage, Inc. | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are met: | ||
* | ||
* * Redistributions of source code must retain the above copyright | ||
* notice, this list of conditions and the following disclaimer. | ||
* * Redistributions in binary form must reproduce the above copyright | ||
* notice, this list of conditions and the following disclaimer in the | ||
* documentation and/or other materials provided with the distribution. | ||
* * Neither the name of the Willow Garage, Inc. nor the names of its | ||
* contributors may be used to endorse or promote products derived from | ||
* this software without specific prior written permission. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
* POSSIBILITY OF SUCH DAMAGE. | ||
* | ||
* author: Dave Hershberger | ||
*/ | ||
|
||
#include <cstdio> // for EOF | ||
#include <string> | ||
#include <sstream> | ||
#include <vector> | ||
|
||
namespace nav2_util | ||
{ | ||
|
||
/** @brief Parse a vector of vector of floats from a string. | ||
* @param input | ||
* @param error_return | ||
* Syntax is [[1.0, 2.0], [3.3, 4.4, 5.5], ...] */ | ||
std::vector<std::vector<float>> parseVVF(const std::string & input, std::string & error_return) | ||
{ | ||
std::vector<std::vector<float>> result; | ||
|
||
std::stringstream input_ss(input); | ||
int depth = 0; | ||
std::vector<float> current_vector; | ||
while (!!input_ss && !input_ss.eof()) { | ||
switch (input_ss.peek()) { | ||
case EOF: | ||
break; | ||
case '[': | ||
depth++; | ||
if (depth > 2) { | ||
error_return = "Array depth greater than 2"; | ||
return result; | ||
} | ||
input_ss.get(); | ||
current_vector.clear(); | ||
break; | ||
case ']': | ||
depth--; | ||
if (depth < 0) { | ||
error_return = "More close ] than open ["; | ||
return result; | ||
} | ||
input_ss.get(); | ||
if (depth == 1) { | ||
result.push_back(current_vector); | ||
} | ||
break; | ||
case ',': | ||
case ' ': | ||
case '\t': | ||
input_ss.get(); | ||
break; | ||
default: // All other characters should be part of the numbers. | ||
if (depth != 2) { | ||
std::stringstream err_ss; | ||
err_ss << "Numbers at depth other than 2. Char was '" << char(input_ss.peek()) << "'."; | ||
error_return = err_ss.str(); | ||
return result; | ||
} | ||
float value; | ||
input_ss >> value; | ||
if (!!input_ss) { | ||
current_vector.push_back(value); | ||
} | ||
break; | ||
} | ||
} | ||
|
||
if (depth != 0) { | ||
error_return = "Unterminated vector string."; | ||
} else { | ||
error_return = ""; | ||
} | ||
|
||
return result; | ||
} | ||
|
||
} // end namespace nav2_util |
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.
is this needed? what's the problem with the current parsing mode?
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.
I think it is way more readable and this method is present in the stack, just has not been moved in humble to nav2_utils from the nav2_costmap yet. And also i wanted to avoid adding hand written code to the sync. As there was a restructuring, I think it is better to use the new way simply.