-
Notifications
You must be signed in to change notification settings - Fork 67
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
Added Angle Pybind11 interface #311
Merged
Merged
Changes from all commits
Commits
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
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,101 @@ | ||
/* | ||
* Copyright (C) 2021 Open Source Robotics Foundation | ||
* | ||
* 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. | ||
* | ||
*/ | ||
|
||
#include <string> | ||
|
||
#include <pybind11/operators.h> | ||
|
||
#include "Angle.hh" | ||
|
||
using namespace pybind11::literals; | ||
|
||
namespace ignition | ||
{ | ||
namespace math | ||
{ | ||
namespace python | ||
{ | ||
void defineMathAngle(py::module &m, const std::string &typestr) | ||
{ | ||
using Class = ignition::math::Angle; | ||
auto toString = [](const Class &si) { | ||
std::stringstream stream; | ||
stream << si; | ||
return stream.str(); | ||
}; | ||
py::class_<Class>( | ||
m, | ||
typestr.c_str(), | ||
py::buffer_protocol(), | ||
py::dynamic_attr()) | ||
.def(py::init<>()) | ||
.def(py::init<const double>()) | ||
.def(py::init<const Class>()) | ||
.def("radian", | ||
py::overload_cast<>(&Class::Radian, py::const_), | ||
"Set the value from an angle in radians.") | ||
.def("radian", | ||
py::overload_cast<double>(&Class::Radian), | ||
"Set the value from an angle in radians.") | ||
.def("set_radian", | ||
&Class::SetRadian, | ||
"Set the value from an angle in radians.") | ||
.def("degree", | ||
py::overload_cast<>(&Class::Degree, py::const_), | ||
"Set the value from an angle in degree.") | ||
.def("degree", | ||
py::overload_cast<double>(&Class::Degree), | ||
"Set the value from an angle in degree.") | ||
.def("set_degree", | ||
&Class::SetDegree, | ||
"Set the value from an angle in degree.") | ||
.def("normalize", | ||
&Class::Normalize, | ||
"Normalize the vector length") | ||
.def("normalized", | ||
&Class::Normalized, | ||
"Return a normalized vector") | ||
.def(py::self + py::self) | ||
.def(py::self += py::self) | ||
.def(py::self * py::self) | ||
.def(py::self *= py::self) | ||
.def(py::self - py::self) | ||
.def(py::self -= py::self) | ||
.def(py::self / py::self) | ||
.def(py::self /= py::self) | ||
.def(py::self != py::self) | ||
.def(py::self == py::self) | ||
.def(py::self < py::self) | ||
.def(py::self <= py::self) | ||
.def(py::self > py::self) | ||
.def(py::self >= py::self) | ||
.def_readonly_static("ZERO", &Class::Zero, "math::Angle(0)") | ||
.def_readonly_static("PI", &Class::Pi, "math::Angle(IGN_PI)") | ||
.def_readonly_static("HALF_PI", &Class::HalfPi, "math::Angle(IGN_PI * 0.5)") | ||
.def_readonly_static("TWO_PI", &Class::TwoPi, "math::Angle(IGN_PI * 2)") | ||
.def("__copy__", [](const Class &self) { | ||
return Class(self); | ||
}) | ||
.def("__deepcopy__", [](const Class &self, py::dict) { | ||
return Class(self); | ||
}, "memo"_a) | ||
.def("__str__", toString) | ||
.def("__repr__", toString); | ||
} | ||
} // namespace python | ||
} // namespace math | ||
} // namespace ignition |
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,44 @@ | ||
/* | ||
* Copyright (C) 2021 Open Source Robotics Foundation | ||
* | ||
* 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 IGNITION_MATH_PYTHON__ANGLE_HPP_ | ||
#define IGNITION_MATH_PYTHON__ANGLE_HPP_ | ||
|
||
#include <string> | ||
|
||
#include <pybind11/pybind11.h> | ||
|
||
#include <ignition/math/Angle.hh> | ||
|
||
namespace py = pybind11; | ||
|
||
namespace ignition | ||
{ | ||
namespace math | ||
{ | ||
namespace python | ||
{ | ||
/// Define a pybind11 wrapper for an ignition::math::Angle | ||
/** | ||
* \param[in] module a pybind11 module to add the definition to | ||
* \param[in] typestr name of the type used by Python | ||
*/ | ||
void defineMathAngle(py::module &m, const std::string &typestr); | ||
} // namespace python | ||
} // namespace math | ||
} // namespace ignition | ||
|
||
#endif // IGNITION_MATH_PYTHON__ANGLE_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
File renamed without changes.
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.
I don't see these tests running on CI 🕵️♀️
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 might happens on Bionic. We at least require
pybind11 2.2
, but Bionic installs 2.0.1-4Get:20 http://archive.ubuntu.com/ubuntu bionic/universe amd64 python3-pybind11 all 2.0.1-4 [4652 B]
Focal is fine https://github.com/ignitionrobotics/ign-math/runs/4559329091?check_suite_focus=true
maybe pip could fix this issue, I will check it
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.
Ah gotcha, thanks! I wouldn't worry about Bionic, targeting Focal is fine!