-
Notifications
You must be signed in to change notification settings - Fork 956
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
Use locale independent conversion from double to string #1099
Merged
davetcoleman
merged 13 commits into
moveit:kinetic-devel
from
isys-vision:fix-locale-ompl-interface
Oct 26, 2018
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
8ff69cf
Use locale independent conversion from double to string
simonschmeisser 9f59e1b
clang format
simonschmeisser cfbe73a
use std::locale::classic() instead of std::locale()
simonschmeisser cbafac0
factor out conversion from double/float to string into moveit_utils
simonschmeisser b5ff13e
clang format
simonschmeisser 8151231
more explicit description
rhaschke f379a54
adress documentation comments
simonschmeisser 36a0e9b
add and use conversion functions from string to double
simonschmeisser 6f4c37d
Don't write localized doubles to benchmark results
simonschmeisser d347e13
use template internally to avoid code duplication
simonschmeisser 89b6caf
Add error handling for std::string->float/double
simonschmeisser aeeb32e
remove extra parantheses again
simonschmeisser 40434d9
Code review comments by Dave
simonschmeisser 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
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,11 @@ | ||
set(MOVEIT_LIB_NAME moveit_utils) | ||
|
||
add_library(${MOVEIT_LIB_NAME} src/lexical_casts.cpp) | ||
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION}) | ||
|
||
target_link_libraries(${MOVEIT_LIB_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES}) | ||
|
||
install(TARGETS ${MOVEIT_LIB_NAME} | ||
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} | ||
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) | ||
install(DIRECTORY include/ DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}) |
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,72 @@ | ||
/********************************************************************* | ||
* Software License Agreement (BSD License) | ||
* | ||
* Copyright (c) 2018, isys vision, GmbH. | ||
* 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 Willow Garage 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: Simon Schmeisser */ | ||
|
||
#ifndef MOVEIT_CORE_UTILS_LEXICAL_CASTS_ | ||
#define MOVEIT_CORE_UTILS_LEXICAL_CASTS_ | ||
|
||
/** \file lexical_casts.h | ||
* \brief locale-agnostic conversion functions from floating point numbers to strings | ||
* | ||
* Depending on the system locale, a different decimal seperator might be used | ||
* for floating point numbers. This is often not wanted for internal (ie non-user | ||
* facing) purposes. This module provides conversion functions that use std::locale::classic() | ||
* (i.e. the default if no locale is set on the system). | ||
*/ | ||
|
||
#include <string> | ||
namespace moveit | ||
{ | ||
namespace core | ||
{ | ||
/** \brief Convert a double to std::string using the classic C locale */ | ||
std::string toString(double d); | ||
|
||
/** \brief Convert a float to std::string using the classic C locale */ | ||
std::string toString(float f); | ||
|
||
/** \brief Converts a std::string to double using the classic C locale | ||
\throws std::runtime_exception if not a valid number | ||
*/ | ||
double toDouble(const std::string& s); | ||
|
||
/** \brief Converts a std::string to float using the classic C locale | ||
\throws std::runtime_exception if not a valid number | ||
*/ | ||
float toFloat(const std::string& s); | ||
} | ||
} | ||
|
||
#endif |
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,91 @@ | ||
/********************************************************************* | ||
* Software License Agreement (BSD License) | ||
* | ||
* Copyright (c) 2018, isys vision, GmbH. | ||
* 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 Willow Garage 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: Simon Schmeisser */ | ||
|
||
#include "moveit/utils/lexical_casts.h" | ||
|
||
#include <locale> | ||
#include <sstream> | ||
|
||
namespace moveit | ||
{ | ||
namespace core | ||
{ | ||
template <class InType> | ||
std::string toStringImpl(InType t) | ||
{ | ||
// convert to string using no locale | ||
std::ostringstream oss; | ||
oss.imbue(std::locale::classic()); | ||
oss << t; | ||
return oss.str(); | ||
} | ||
|
||
std::string toString(double d) | ||
{ | ||
return toStringImpl(d); | ||
} | ||
|
||
std::string toString(float f) | ||
{ | ||
return toStringImpl(f); | ||
} | ||
|
||
template <class OutType> | ||
OutType toRealImpl(const std::string& s) | ||
{ | ||
// convert from string using no locale | ||
std::istringstream stream(s); | ||
stream.imbue(std::locale::classic()); | ||
OutType result; | ||
stream >> result; | ||
if (stream.fail() || !stream.eof()) | ||
{ | ||
throw std::runtime_error("Failed converting string to real number"); | ||
} | ||
return result; | ||
} | ||
|
||
double toDouble(const std::string& s) | ||
{ | ||
return toRealImpl<double>(s); | ||
} | ||
|
||
float toFloat(const std::string& s) | ||
{ | ||
return toRealImpl<float>(s); | ||
} | ||
} | ||
} |
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
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
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.
this is not a package, remove
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.
this section is about what libraries are exported by the moveit_core package, you get linker errors in dependent packages if moveit_utils is not added here
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.
oops sorry. the github code folding hid the relevant section and i made a wrong assumption