Commit 33f39c2c authored by Jordan Lack's avatar Jordan Lack

reformat

parent 06621e13
Pipeline #60854540 (#944) passed with stages
in 49 minutes and 52 seconds
......@@ -315,7 +315,7 @@ inline bool operator==(const FramePoint& lhs, const FramePoint& rhs)
inline FrameVector operator-(FramePoint p1, const FramePoint& p2)
{
p1.getReferenceFrame()->checkReferenceFramesMatch(p2.getReferenceFrame());
return FrameVector(p1.getReferenceFrame(),p2.x()-p1.x(),p2.y()-p1.y(),p2.z()-p1.z());
return FrameVector(p1.getReferenceFrame(), p1.x() - p2.x(), p1.y() - p2.y(), p1.z() - p2.z());
}
/**
......
......@@ -304,7 +304,7 @@ class Point3d : public Math::TransformableGeometricObject
inline Vector3d operator-(Point3d p1, const Point3d& p2)
{
return Vector3d(p1.x()-p2.x(),p1.y()-p2.y(),p1.z()-p2.z());
return Vector3d(p1.x() - p2.x(), p1.y() - p2.y(), p1.z() - p2.z());
}
inline Point3d operator*(Point3d leftHandSide, const double scale)
......
......@@ -331,11 +331,11 @@ TEST_F(FramePointTest, testOperatorOverloads)
FramePoint p2(root1, RobotDynamics::Math::Vector3d(-1., -2., -3.));
FrameVector p3 = framePoint - p2;
FrameVector v = framePoint - p2;
EXPECT_EQ(p3.x(), 4.);
EXPECT_EQ(p3.y(), 8.);
EXPECT_EQ(p3.z(), 12.);
EXPECT_EQ(v.x(), 4.);
EXPECT_EQ(v.y(), 8.);
EXPECT_EQ(v.z(), 12.);
}
int main(int argc, char** argv)
......
......@@ -147,7 +147,7 @@ TEST_F(FixedBase3DoFPlanar, testPlanar3LinkPendulum)
try
{
p += p2;
FrameVector v = p2 - p;
}
catch (RobotDynamics::ReferenceFrameException& e)
{
......
......@@ -76,7 +76,7 @@ TEST_F(FixedBase3DoFPlanar, changeFrameAndCopy)
v2 = v1.changeFrameAndCopy(ReferenceFrame::getWorldFrame());
EXPECT_FALSE(v2.wx() == v1.wx());
EXPECT_TRUE(v2.wy()==v1.wy()); // its a rot about y axis, so this one isn't supposed to change
EXPECT_TRUE(v2.wy() == v1.wy()); // its a rot about y axis, so this one isn't supposed to change
EXPECT_FALSE(v2.wz() == v1.wz());
EXPECT_FALSE(v2.vx() == v1.vx());
EXPECT_FALSE(v2.vy() == v1.vy());
......@@ -97,7 +97,7 @@ TEST_F(FixedBase3DoFPlanar, changeFrameAndCopy)
v4 = v3.changeFrameAndCopy(ReferenceFrame::getWorldFrame());
EXPECT_FALSE(v3.wx() == v4.wx());
EXPECT_TRUE(v3.wy()==v4.wy()); // its a rot about y axis, so this one isn't supposed to change
EXPECT_TRUE(v3.wy() == v4.wy()); // its a rot about y axis, so this one isn't supposed to change
EXPECT_FALSE(v3.wz() == v4.wz());
EXPECT_FALSE(v3.vx() == v4.vx());
EXPECT_FALSE(v3.vy() == v4.vy());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment