Skip to content

Commit 1428415

Browse files
committed
more fusion interfaces
1 parent e6081db commit 1428415

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

include/spark_dsg/traversability_boundary.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,9 @@ struct Boundary {
338338
*/
339339
void fuseBoundaryStates(
340340
const BoundarySide& other,
341-
std::function<void(TraversabilityState, TraversabilityState&)> fuse_fn =
342-
[](TraversabilityState from, TraversabilityState& to) {
343-
fuseStates(from, to);
344-
});
341+
std::function<void(TraversabilityState, TraversabilityState&)> fuse_fn);
342+
343+
void fuseBoundaryStates(const BoundarySide& other, bool pessimistic = false);
345344
};
346345

347346
BoundarySide side(Side side);

src/traversability_boundary.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,14 @@ void Boundary::BoundarySide::fuseBoundaryStates(
481481
}
482482
}
483483

484+
void Boundary::BoundarySide::fuseBoundaryStates(const BoundarySide& other,
485+
bool pessimistic) {
486+
fuseBoundaryStates(other,
487+
[pessimistic](TraversabilityState from, TraversabilityState& to) {
488+
fuseStates(from, to, pessimistic);
489+
});
490+
}
491+
484492
double& Boundary::coord(Side side) {
485493
switch (side) {
486494
case Side::BOTTOM:

0 commit comments

Comments
 (0)