Skip to content

Commit 877bfa0

Browse files
committed
Fix clang-format
1 parent a9dca68 commit 877bfa0

9 files changed

Lines changed: 205 additions & 212 deletions

File tree

tesseract_collision/coal/include/tesseract_collision/coal/coal_casthullshape.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
5353

5454
namespace tesseract_collision::tesseract_collision_coal
5555
{
56-
5756
class CastHullShape : public coal::ShapeBase
5857
{
5958
public:

tesseract_collision/coal/include/tesseract_collision/coal/coal_casthullshape_utility.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,13 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
5757

5858
namespace coal
5959
{
60-
6160
using tesseract_collision::tesseract_collision_coal::CastHullShape;
6261

6362
template <>
6463
void computeBV<coal::AABB, CastHullShape>(const CastHullShape& s, const coal::Transform3s& tf, coal::AABB& bv);
6564

6665
namespace details
6766
{
68-
6967
/// @brief CastHullShape support function.
7068
template <int _SupportOptions = SupportOptions::NoSweptSphere> // NOLINT(bugprone-reserved-identifier)
7169
void getShapeSupport(const CastHullShape* shape,

tesseract_collision/coal/src/coal_casthullshape.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
5959

6060
namespace tesseract_collision::tesseract_collision_coal
6161
{
62-
6362
CastHullShape::CastHullShape(std::shared_ptr<coal::ShapeBase> shape, const coal::Transform3s& castTransform)
6463
: shape_(std::move(shape))
6564
, castTransform_(castTransform)

tesseract_collision/coal/src/coal_casthullshape_utility.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
5353

5454
namespace coal
5555
{
56-
5756
template <>
5857
void computeBV<coal::AABB, CastHullShape>(const CastHullShape& s, const coal::Transform3s& tf, coal::AABB& bv)
5958
{
@@ -106,7 +105,6 @@ void computeBV<coal::AABB, CastHullShape>(const CastHullShape& s, const coal::Tr
106105

107106
namespace details
108107
{
109-
110108
template <int _SupportOptions> // NOLINT(bugprone-reserved-identifier)
111109
void getShapeSupport(const CastHullShape* cast_hull_shape,
112110
const Vec3s& dir,

tesseract_collision/coal/src/coal_utils.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
5757

5858
namespace tesseract_collision::tesseract_collision_coal
5959
{
60-
6160
namespace
6261
{
6362
CollisionGeometryPtr createShapePrimitive(const tesseract_geometry::Plane::ConstPtr& geom)

tesseract_collision/test/coal/coal_casthullshape_unit.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ TEST(CoalCastHullShapeUnit, ComputeVolumeUnit)
204204
// Swept volume should be larger than original
205205
EXPECT_GT(cast_hull_translated_volume, box_volume);
206206
EXPECT_GT(cast_hull_translated_volume, 8.0);
207-
207+
208208
// Should be reasonable (not infinite or negative)
209209
EXPECT_LT(cast_hull_translated_volume, 100.0); // Reasonable upper bound
210210
EXPECT_GT(cast_hull_translated_volume, 0.0);
@@ -237,7 +237,7 @@ TEST(CoalCastHullShapeUnit, ComputeVolumeUnit)
237237

238238
// Swept volume should be larger than original
239239
EXPECT_GT(cast_hull_sphere_translated_volume, sphere_volume);
240-
240+
241241
// Should be reasonable (not infinite or negative)
242242
EXPECT_GT(cast_hull_sphere_translated_volume, 0.0);
243243
EXPECT_LT(cast_hull_sphere_translated_volume, 10.0); // Reasonable upper bound
@@ -278,7 +278,7 @@ TEST(CoalCastHullShapeUnit, ComputeVolumeUnit)
278278

279279
// Should be larger due to both rotation and translation
280280
EXPECT_GT(cast_hull_rotated_volume, box_volume);
281-
281+
282282
// Should be reasonable
283283
EXPECT_GT(cast_hull_rotated_volume, 0.0);
284284
EXPECT_LT(cast_hull_rotated_volume, 20.0); // Reasonable upper bound

tesseract_collision/test_suite/include/tesseract_collision/test_suite/collision_box_box_cast_unit.hpp

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -168,29 +168,29 @@ inline void runTest(ContinuousContactManager& checker)
168168
result.flattenMoveResults(result_vector);
169169

170170
EXPECT_TRUE(!result_vector.empty());
171-
EXPECT_NEAR(result_vector[0].distance, -0.2475, 0.001);
172-
EXPECT_NEAR(result_vector[0].cc_time[0], -1.0, 0.001);
173-
EXPECT_NEAR(result_vector[0].cc_time[1], 0.25, 0.001);
174-
EXPECT_TRUE(result_vector[0].cc_type[0] == ContinuousCollisionType::CCType_None);
175-
EXPECT_TRUE(result_vector[0].cc_type[1] == ContinuousCollisionType::CCType_Between);
176-
177-
EXPECT_NEAR(result_vector[0].nearest_points[0][0], -0.5, 0.001);
178-
EXPECT_NEAR(result_vector[0].nearest_points[0][1], 0.5, 0.001);
179-
EXPECT_NEAR(result_vector[0].nearest_points[0][2], 0.0, 0.001);
180-
181-
EXPECT_NEAR(result_vector[0].nearest_points[1][0], -0.325, 0.001);
182-
EXPECT_NEAR(result_vector[0].nearest_points[1][1], 0.325, 0.001);
183-
EXPECT_NEAR(result_vector[0].nearest_points[1][2], 0.0, 0.001);
184-
185-
Eigen::Vector3d p0 = result_vector[0].transform[1] * result_vector[0].nearest_points_local[1];
186-
EXPECT_NEAR(p0[0], -1.275, 0.001);
187-
EXPECT_NEAR(p0[1], -0.625, 0.001);
188-
EXPECT_NEAR(p0[2], 0.0, 0.001);
189-
190-
Eigen::Vector3d p1 = result_vector[0].cc_transform[1] * result_vector[0].nearest_points_local[1];
191-
EXPECT_NEAR(p1[0], 2.525, 0.001);
192-
EXPECT_NEAR(p1[1], 3.175, 0.001);
193-
EXPECT_NEAR(p1[2], 0.0, 0.001);
171+
EXPECT_NEAR(result_vector[0].distance, -0.2475, 0.001);
172+
EXPECT_NEAR(result_vector[0].cc_time[0], -1.0, 0.001);
173+
EXPECT_NEAR(result_vector[0].cc_time[1], 0.25, 0.001);
174+
EXPECT_TRUE(result_vector[0].cc_type[0] == ContinuousCollisionType::CCType_None);
175+
EXPECT_TRUE(result_vector[0].cc_type[1] == ContinuousCollisionType::CCType_Between);
176+
177+
EXPECT_NEAR(result_vector[0].nearest_points[0][0], -0.5, 0.001);
178+
EXPECT_NEAR(result_vector[0].nearest_points[0][1], 0.5, 0.001);
179+
EXPECT_NEAR(result_vector[0].nearest_points[0][2], 0.0, 0.001);
180+
181+
EXPECT_NEAR(result_vector[0].nearest_points[1][0], -0.325, 0.001);
182+
EXPECT_NEAR(result_vector[0].nearest_points[1][1], 0.325, 0.001);
183+
EXPECT_NEAR(result_vector[0].nearest_points[1][2], 0.0, 0.001);
184+
185+
Eigen::Vector3d p0 = result_vector[0].transform[1] * result_vector[0].nearest_points_local[1];
186+
EXPECT_NEAR(p0[0], -1.275, 0.001);
187+
EXPECT_NEAR(p0[1], -0.625, 0.001);
188+
EXPECT_NEAR(p0[2], 0.0, 0.001);
189+
190+
Eigen::Vector3d p1 = result_vector[0].cc_transform[1] * result_vector[0].nearest_points_local[1];
191+
EXPECT_NEAR(p1[0], 2.525, 0.001);
192+
EXPECT_NEAR(p1[1], 3.175, 0.001);
193+
EXPECT_NEAR(p1[2], 0.0, 0.001);
194194
}
195195
}
196196
} // namespace tesseract_collision::test_suite

0 commit comments

Comments
 (0)