Skip to content
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

Implements a method to get the link inertia #2218

Merged
merged 6 commits into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions include/gz/sim/Link.hh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <string>
#include <vector>

#include <gz/math/Inertial.hh>
#include <gz/math/Matrix3.hh>
#include <gz/math/Pose3.hh>
#include <gz/math/Quaternion.hh>
Expand Down Expand Up @@ -173,6 +174,13 @@ namespace gz
public: std::optional<math::Pose3d> WorldPose(
const EntityComponentManager &_ecm) const;

/// \brief Get the world inertia of the link.
/// \param[in] _ecm Entity-component manager.
/// \return Inertia of the link pose in world frame or nullopt
/// if the link does not have the component components::Inertial.
public: std::optional<math::Inertiald> WorldInertial(
const EntityComponentManager &_ecm) const;

/// \brief Get the world pose of the link inertia.
/// \param[in] _ecm Entity-component manager.
/// \return Inertial pose in world frame or nullopt if the
Expand Down
3 changes: 3 additions & 0 deletions python/src/gz/sim/Link.cc
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ void defineSimLink(py::object module)
.def("world_pose", &gz::sim::Link::WorldPose,
py::arg("ecm"),
"Get the pose of the link frame in the world coordinate frame.")
.def("world_inertial", &gz::sim::Link::WorldInertial,
py::arg("ecm"),
"Get the inertia of the link in the world frame.")
.def("world_inertial_pose", &gz::sim::Link::WorldInertialPose,
py::arg("ecm"),
"Get the world pose of the link inertia.")
Expand Down
6 changes: 5 additions & 1 deletion python/test/link_TEST.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

from gz_test_deps.common import set_verbosity
from gz_test_deps.sim import K_NULL_ENTITY, TestFixture, Link, Model, World, world_entity
from gz_test_deps.math import Matrix3d, Vector3d, Pose3d
from gz_test_deps.math import Inertiald, Matrix3d, Vector3d, Pose3d

class TestModel(unittest.TestCase):
post_iterations = 0
Expand Down Expand Up @@ -59,6 +59,10 @@ def on_pre_udpate_cb(_info, _ecm):
# Visuals Test
self.assertNotEqual(K_NULL_ENTITY, link.visual_by_name(_ecm, 'visual_test'))
self.assertEqual(1, link.visual_count(_ecm))
# World Inertial Test
self.assertEqual(Pose3d(), link.world_inertial(_ecm).pose())
self.assertEqual(Matrix3d(1, 0, 0, 0, 1, 0, 0, 0, 1), link.world_inertial(_ecm).moi())
self.assertEqual(10.0, link.world_inertial(_ecm).mass_matrix().mass())
# World Inertial Pose Test.
self.assertEqual(Pose3d(), link.world_inertial_pose(_ecm))
# World Velocity Test
Expand Down
18 changes: 17 additions & 1 deletion src/Link.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*
*/

#include <gz/math/Inertial.hh>
#include <gz/math/Matrix3.hh>
#include <gz/math/Pose3.hh>
#include <gz/math/Vector3.hh>
Expand Down Expand Up @@ -190,6 +189,23 @@ std::optional<math::Pose3d> Link::WorldPose(
.value_or(sim::worldPose(this->dataPtr->id, _ecm));
}

//////////////////////////////////////////////////
std::optional<math::Inertiald> Link::WorldInertial(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

include <optional> and math::Inertiald

Copy link
Contributor Author

@Voldivh Voldivh Oct 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those are being included in the link.hh file, should I move them to this file?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that's necessary.

const EntityComponentManager &_ecm) const
{
auto inertial = _ecm.Component<components::Inertial>(this->dataPtr->id);
auto worldPose = _ecm.ComponentData<components::WorldPose>(this->dataPtr->id)
.value_or(sim::worldPose(this->dataPtr->id, _ecm));

if (!inertial)
return std::nullopt;

const math::Pose3d &comWorldPose =
worldPose * inertial->Data().Pose();
return std::make_optional(
math::Inertiald(inertial->Data().MassMatrix(), comWorldPose));
}

//////////////////////////////////////////////////
std::optional<math::Pose3d> Link::WorldInertialPose(
const EntityComponentManager &_ecm) const
Expand Down
29 changes: 29 additions & 0 deletions test/integration/link.cc
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,35 @@ TEST_F(LinkIntegrationTest, LinkAccelerations)
ecm.Component<components::WorldAngularAcceleration>(eLink));
}

//////////////////////////////////////////////////
TEST_F(LinkIntegrationTest, LinkInertia)
{
EntityComponentManager ecm;
EventManager eventMgr;
SdfEntityCreator creator(ecm, eventMgr);

auto eLink = ecm.CreateEntity();
ecm.CreateComponent(eLink, components::Link());

Link link(eLink);
EXPECT_EQ(eLink, link.Entity());

ASSERT_TRUE(link.Valid(ecm));

// Before we add components, pose functions should return nullopt
EXPECT_EQ(std::nullopt, link.WorldInertial(ecm));

math::MassMatrix3d linkMassMatrix(10.0, {0.4, 0.4, 0.4}, {0.02, 0.02, 0.02});
math::Pose3d linkWorldPose;
linkWorldPose.Set(0.0, 0.1, 0.2, 0.0, GZ_PI_4, GZ_PI_2);
azeey marked this conversation as resolved.
Show resolved Hide resolved
math::Inertiald linkInertial{linkMassMatrix, linkWorldPose};
ecm.CreateComponent(eLink, components::Inertial(linkInertial));

ASSERT_TRUE(link.WorldInertial(ecm));
EXPECT_EQ(10.0, link.WorldInertial(ecm).value().MassMatrix().Mass());
EXPECT_EQ(linkWorldPose, link.WorldInertial(ecm).value().Pose());
}

//////////////////////////////////////////////////
TEST_F(LinkIntegrationTest, LinkInertiaMatrix)
{
Expand Down