Commit 1a32bb2d authored by Pascal Parraud's avatar Pascal Parraud
Browse files

Fixed issue #1021: regression in EventEnablingPredicateFilter

parent b73c4ae7
......@@ -21,6 +21,9 @@
</properties>
<body>
<release version="12.0" date="TBD" description="TBD">
<action dev="pascal" type="fix" issue="1021">
Fixed regression introduced in EventEnablingPredicateFilter when fixing issue 1017.
</action>
<action dev="luc" type="fix" issue="1020">
Fixed regression introduced in ImpulseManeuver when fixing issue 1017.
</action>
......
......@@ -291,14 +291,14 @@ public class EventEnablingPredicateFilter
public Action eventOccurred(final SpacecraftState s, final EventDetector detector, final boolean increasing) {
final EventEnablingPredicateFilter ef = (EventEnablingPredicateFilter) detector;
final Transformer transformer = ef.forward ? ef.transformers[ef.transformers.length - 1] : ef.transformers[0];
return ef.rawDetector.getHandler().eventOccurred(s, ef, transformer == Transformer.PLUS ? increasing : !increasing);
return ef.rawDetector.getHandler().eventOccurred(s, ef.rawDetector, transformer == Transformer.PLUS ? increasing : !increasing);
}
/** {@inheritDoc} */
@Override
public SpacecraftState resetState(final EventDetector detector, final SpacecraftState oldState) {
final EventEnablingPredicateFilter ef = (EventEnablingPredicateFilter) detector;
return ef.rawDetector.getHandler().resetState(ef, oldState);
return ef.rawDetector.getHandler().resetState(ef.rawDetector, oldState);
}
}
......
Supports Markdown
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