Skip to content

Commit a47df7e

Browse files
authored
Fix unit tests (#23)
* Add min_distance field in ccd. * fixes * fix min_distance in tests
1 parent 726f70f commit a47df7e

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/ipc/ipc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ bool is_step_collision_free(
224224
// Broad phase
225225
Candidates candidates;
226226
construct_collision_candidates(
227-
mesh, V0, V1, candidates, /*inflation_radius=*/min_distance / 2.,
227+
mesh, V0, V1, candidates, /*inflation_radius=*/min_distance / 1.99,
228228
method);
229229

230230
// Narrow phase
@@ -296,7 +296,7 @@ double compute_collision_free_stepsize(
296296
// Broad phase
297297
Candidates candidates;
298298
construct_collision_candidates(
299-
mesh, V0, V1, candidates, /*inflation_radius=*/min_distance / 2.,
299+
mesh, V0, V1, candidates, /*inflation_radius=*/min_distance / 1.99,
300300
method);
301301

302302
// Narrow phase

tests/ccd/test_ccd.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ TEST_CASE("Repeated CCD", "[ccd][repeat]")
266266
{
267267
const double FIRST_TOL = 1e-6, SECOND_TOL = 1e-7;
268268
const double FIRST_MAX_ITER = 1e6, SECOND_MAX_ITER = 1e6;
269+
const double MIN_DISTANCE = 0.0;
269270

270271
// BroadPhaseMethod method = GENERATE_BROAD_PHASE_METHODS();
271272
BroadPhaseMethod broadphase_method = BroadPhaseMethod::HASH_GRID;
@@ -324,10 +325,10 @@ TEST_CASE("Repeated CCD", "[ccd][repeat]")
324325
mesh, V0, V1, candidates, inflation_radius, broadphase_method);
325326

326327
bool has_collisions = !is_step_collision_free(
327-
candidates, mesh, V0, V1, FIRST_TOL, FIRST_MAX_ITER);
328+
candidates, mesh, V0, V1, MIN_DISTANCE, FIRST_TOL, FIRST_MAX_ITER);
328329

329330
double stepsize = compute_collision_free_stepsize(
330-
candidates, mesh, V0, V1, FIRST_TOL, FIRST_MAX_ITER);
331+
candidates, mesh, V0, V1, MIN_DISTANCE, FIRST_TOL, FIRST_MAX_ITER);
331332

332333
if (!has_collisions) {
333334
CHECK(stepsize == 1.0);
@@ -347,10 +348,12 @@ TEST_CASE("Repeated CCD", "[ccd][repeat]")
347348
}
348349

349350
has_collisions_repeated = !is_step_collision_free(
350-
candidates, mesh, V0, Vt, SECOND_TOL, SECOND_MAX_ITER);
351+
candidates, mesh, V0, Vt, MIN_DISTANCE, SECOND_TOL,
352+
SECOND_MAX_ITER);
351353

352354
stepsize_repeated = compute_collision_free_stepsize(
353-
candidates, mesh, V0, Vt, SECOND_TOL, SECOND_MAX_ITER);
355+
candidates, mesh, V0, Vt, MIN_DISTANCE, SECOND_TOL,
356+
SECOND_MAX_ITER);
354357

355358
CAPTURE(
356359
t0_filename, t1_filename, broadphase_method, recompute_candidates,

0 commit comments

Comments
 (0)