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.

Sign up for GitHub

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

Jump to bottom

Fix Tests #119

Merged
merged 3 commits into from
Feb 18, 2022
Merged

Fix Tests #119

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aebd3c2
fix tests where particles are too far apart to collide
FG-TUM Feb 18, 2022
1d16be8
clarify that this is a squared distance
FG-TUM Feb 18, 2022
7a8faa1
collisionDistanceFactor > 1 to actually cover all conjunctions
FG-TUM Feb 18, 2022
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
32 changes: 18 additions & 14 deletions tests/testladds/CollisionFunctorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,23 @@
* The functor is expected to identify a collision between each particle and its direct neighbors.
*/
TEST(CollisionFunctorTest, ThreeParticles) {
constexpr double cutoff{1.5};
constexpr double cutoff{1};
constexpr bool newton3{false};
constexpr size_t numDebris{3};

std::vector<Particle> debris;
debris.reserve(numDebris);

// Add three particles in a row on the X axis separated by 1
// Add three particles with radius .6m in a row on the X axis separated by 1 m
// => direct neighbors overlap
for (size_t i = 0; i < numDebris; ++i) {
debris.emplace_back(std::array<double, 3>{static_cast<double>(i), 0., 0.},
debris.emplace_back(std::array<double, 3>{static_cast<double>(i) / 1000., 0., 0.},
std::array<double, 3>{0., static_cast<double>(i), 0.},
i,
"dummy",
Particle::ActivityState::passive,
1.,
1.,
.6,
Particle::calculateBcInv(0., 1., 1., 2.2));
}

Expand All @@ -49,8 +50,8 @@ TEST(CollisionFunctorTest, ThreeParticles) {
auto collisions = collisionFunctor.getCollisions();

decltype(collisions) expected{
{&debris[0], &debris[1], 1.0},
{&debris[1], &debris[2], 1.0},
{&debris[0], &debris[1], 1.0 / (1000 * 1000)}, // convert distance to km^2
{&debris[1], &debris[2], 1.0 / (1000 * 1000)}, // convert distance to km^2
};

EXPECT_THAT(collisionFunctor.getCollisions(), ::testing::UnorderedElementsAreArray(expected));
Expand Down Expand Up @@ -199,7 +200,7 @@ TEST(CollisionFunctorTest, MixActivityStates) {
}

/**
* Two particles each with radius 1 are placed at a distance of 3.
* Two particles each with radius 1 are placed at a distance of 3 m.
* Using collisionDistanceFactor 1 they should not be considered colliding, using 2 they should.
*/
TEST(CollisionFunctorTest, CollisionDistanceFactorTest) {
Expand All @@ -217,7 +218,7 @@ TEST(CollisionFunctorTest, CollisionDistanceFactorTest) {
particleMass,
particleRadius,
Particle::calculateBcInv(0., particleMass, particleRadius, 2.2)},
{{3., 0., 0.},
{{3. / 1000, 0., 0.},
{-1., 0., 0.},
2,
"B",
Expand All @@ -233,10 +234,12 @@ TEST(CollisionFunctorTest, CollisionDistanceFactorTest) {
collisionFunctor.endTraversal(newton3);
if (collisionDistanceFactor == 1.) {
// distance too far -> no collisions
EXPECT_EQ(collisionFunctor.getCollisions().size(), 0);
EXPECT_EQ(collisionFunctor.getCollisions().size(), 0)
<< "For collisionDistanceFactor: " << collisionDistanceFactor;
} else if (collisionDistanceFactor == 2.) {
// over approximation should now include particles -> collision
EXPECT_EQ(collisionFunctor.getCollisions().size(), 1);
EXPECT_EQ(collisionFunctor.getCollisions().size(), 1)
<< "For collisionDistanceFactor: " << collisionDistanceFactor;
} else {
GTEST_FAIL() << "Unexpected collisionDistanceFactor: " << collisionDistanceFactor;
}
Expand All @@ -247,11 +250,11 @@ TEST_P(CollisionFunctorTest, LinearInterpolationTest) {
constexpr double cutoff{80.0};
constexpr bool newton3{false};
constexpr size_t numDebris{2};
constexpr double particleRadius{1.};
constexpr double particleRadius{1000.};

const auto &[x1, x2, v1, v2, dt, expected_dist] = GetParam();
const auto &[x1, x2, v1, v2, dt, squaredExpectedDist] = GetParam();

CollisionFunctor collisionFunctor(cutoff, dt, 10., 0.1);
CollisionFunctor collisionFunctor(cutoff, dt, 1., 0.1);

std::vector<Particle> debris;
debris.reserve(numDebris);
Expand All @@ -273,7 +276,7 @@ TEST_P(CollisionFunctorTest, LinearInterpolationTest) {

auto collisions = collisionFunctor.getCollisions();

decltype(collisions) expected{{&debris[0], &debris[1], expected_dist}};
decltype(collisions) expected{{&debris[0], &debris[1], squaredExpectedDist}};

// helper function for debugging output
auto getIDsStringFromPointers = [](const auto &collisions) {
Expand All @@ -293,6 +296,7 @@ TEST_P(CollisionFunctorTest, LinearInterpolationTest) {
// Generate tests for all configuration combinations
INSTANTIATE_TEST_SUITE_P(Generated,
CollisionFunctorTest,
// x1 [km], x2 [km], v1 [km/s], v2 [km/2], dt [s], squared expected_dist [km^2]
testing::ValuesIn({std::make_tuple(std::array<double, 3>{0., 1., 2.},
std::array<double, 3>{2., 4., 6.},
std::array<double, 3>{0., 0., 0.},
Expand Down