diff --git a/constraints/src/main/java/gov/nasa/jpl/aerie/constraints/tree/ViolationsOf.java b/constraints/src/main/java/gov/nasa/jpl/aerie/constraints/tree/ViolationsOfWindows.java similarity index 83% rename from constraints/src/main/java/gov/nasa/jpl/aerie/constraints/tree/ViolationsOf.java rename to constraints/src/main/java/gov/nasa/jpl/aerie/constraints/tree/ViolationsOfWindows.java index 583d3d0253..38c9ba5bfc 100644 --- a/constraints/src/main/java/gov/nasa/jpl/aerie/constraints/tree/ViolationsOf.java +++ b/constraints/src/main/java/gov/nasa/jpl/aerie/constraints/tree/ViolationsOfWindows.java @@ -10,10 +10,10 @@ import java.util.Objects; import java.util.Set; -public final class ViolationsOf implements Expression> { +public final class ViolationsOfWindows implements Expression> { public final Expression expression; - public ViolationsOf(Expression expression) { + public ViolationsOfWindows(Expression expression) { this.expression = expression; } @@ -35,8 +35,8 @@ public String prettyPrint(final String prefix) { @Override public boolean equals(Object obj) { - if (!(obj instanceof ViolationsOf)) return false; - final var o = (ViolationsOf)obj; + if (!(obj instanceof ViolationsOfWindows)) return false; + final var o = (ViolationsOfWindows)obj; return Objects.equals(this.expression, o.expression); } diff --git a/constraints/src/test/java/gov/nasa/jpl/aerie/constraints/json/ConstraintParsersTest.java b/constraints/src/test/java/gov/nasa/jpl/aerie/constraints/json/ConstraintParsersTest.java index 1a0e624876..1a02ada910 100644 --- a/constraints/src/test/java/gov/nasa/jpl/aerie/constraints/json/ConstraintParsersTest.java +++ b/constraints/src/test/java/gov/nasa/jpl/aerie/constraints/json/ConstraintParsersTest.java @@ -3,8 +3,6 @@ import gov.nasa.jpl.aerie.constraints.time.Interval; import gov.nasa.jpl.aerie.constraints.tree.ActivitySpan; import gov.nasa.jpl.aerie.constraints.tree.ActivityWindow; -import gov.nasa.jpl.aerie.constraints.tree.All; -import gov.nasa.jpl.aerie.constraints.tree.Any; import gov.nasa.jpl.aerie.constraints.tree.And; import gov.nasa.jpl.aerie.constraints.tree.Changes; import gov.nasa.jpl.aerie.constraints.tree.DiscreteParameter; @@ -16,7 +14,6 @@ import gov.nasa.jpl.aerie.constraints.tree.ForEachActivityViolations; import gov.nasa.jpl.aerie.constraints.tree.GreaterThan; import gov.nasa.jpl.aerie.constraints.tree.GreaterThanOrEqual; -import gov.nasa.jpl.aerie.constraints.tree.Invert; import gov.nasa.jpl.aerie.constraints.tree.LessThan; import gov.nasa.jpl.aerie.constraints.tree.LessThanOrEqual; import gov.nasa.jpl.aerie.constraints.tree.Not; diff --git a/constraints/src/test/java/gov/nasa/jpl/aerie/constraints/tree/ASTTests.java b/constraints/src/test/java/gov/nasa/jpl/aerie/constraints/tree/ASTTests.java index c844be909c..a34c9b5948 100644 --- a/constraints/src/test/java/gov/nasa/jpl/aerie/constraints/tree/ASTTests.java +++ b/constraints/src/test/java/gov/nasa/jpl/aerie/constraints/tree/ASTTests.java @@ -31,7 +31,6 @@ import static gov.nasa.jpl.aerie.constraints.time.Interval.interval; import static gov.nasa.jpl.aerie.merlin.protocol.types.Duration.MICROSECONDS; import static gov.nasa.jpl.aerie.merlin.protocol.types.Duration.SECONDS; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertIterableEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; @@ -627,7 +626,7 @@ public void testNestedForEachActivitySpans() { new Supplier<>(spans) ) ).evaluate(simResults, new EvaluationEnvironment()); - + final var expected = new Spans(interval(4, 6, SECONDS), interval(4, 6, SECONDS)); assertEquivalent(expected, result); @@ -647,7 +646,7 @@ public void testViolationsOf() { .set(Interval.between(5, 6, SECONDS), false) .set(Interval.between(7,20, SECONDS), true); - final var result = new ViolationsOf(new Supplier<>(windows)).evaluate(simResults, new EvaluationEnvironment()); + final var result = new ViolationsOfWindows(new Supplier<>(windows)).evaluate(simResults, new EvaluationEnvironment()); final var expected = List.of(new Violation(windows.not().select(simResults.bounds))); diff --git a/merlin-server/constraints-dsl-compiler/src/libs/constraints-edsl-fluent-api.ts b/merlin-server/constraints-dsl-compiler/src/libs/constraints-edsl-fluent-api.ts index 55e57da99b..95401f2028 100644 --- a/merlin-server/constraints-dsl-compiler/src/libs/constraints-edsl-fluent-api.ts +++ b/merlin-server/constraints-dsl-compiler/src/libs/constraints-edsl-fluent-api.ts @@ -86,7 +86,7 @@ export class Windows { * @param activityTypes the activity types */ public static DuringAny(...activityTypes: Gen.ActivityType[]) : Windows { - return Windows.Any( + return Windows.Or( ...activityTypes.map((activityType) => Windows.During(activityType)) ); } diff --git a/merlin-server/src/test/java/gov/nasa/jpl/aerie/merlin/server/services/ConstraintsDSLCompilationServiceTests.java b/merlin-server/src/test/java/gov/nasa/jpl/aerie/merlin/server/services/ConstraintsDSLCompilationServiceTests.java index bc4190fbad..a60c7241b7 100644 --- a/merlin-server/src/test/java/gov/nasa/jpl/aerie/merlin/server/services/ConstraintsDSLCompilationServiceTests.java +++ b/merlin-server/src/test/java/gov/nasa/jpl/aerie/merlin/server/services/ConstraintsDSLCompilationServiceTests.java @@ -3,8 +3,7 @@ import gov.nasa.jpl.aerie.constraints.time.Interval; import gov.nasa.jpl.aerie.constraints.tree.ActivitySpan; import gov.nasa.jpl.aerie.constraints.tree.ActivityWindow; -import gov.nasa.jpl.aerie.constraints.tree.All; -import gov.nasa.jpl.aerie.constraints.tree.Any; +import gov.nasa.jpl.aerie.constraints.tree.And; import gov.nasa.jpl.aerie.constraints.tree.Changes; import gov.nasa.jpl.aerie.constraints.tree.DiscreteParameter; import gov.nasa.jpl.aerie.constraints.tree.DiscreteResource; @@ -16,11 +15,12 @@ import gov.nasa.jpl.aerie.constraints.tree.ForEachActivityViolations; import gov.nasa.jpl.aerie.constraints.tree.GreaterThan; import gov.nasa.jpl.aerie.constraints.tree.GreaterThanOrEqual; -import gov.nasa.jpl.aerie.constraints.tree.Invert; import gov.nasa.jpl.aerie.constraints.tree.LessThan; import gov.nasa.jpl.aerie.constraints.tree.LessThanOrEqual; import gov.nasa.jpl.aerie.constraints.tree.LongerThan; +import gov.nasa.jpl.aerie.constraints.tree.Not; import gov.nasa.jpl.aerie.constraints.tree.NotEqual; +import gov.nasa.jpl.aerie.constraints.tree.Or; import gov.nasa.jpl.aerie.constraints.tree.Plus; import gov.nasa.jpl.aerie.constraints.tree.ProfileExpression; import gov.nasa.jpl.aerie.constraints.tree.Rate; @@ -868,7 +868,7 @@ export default () => { } """, new ForEachActivityViolations("activity", "activity alias 0", new ForEachActivityViolations("activity", "activity alias 1", new ViolationsOfWindows( - new All(new ActivityWindow("activity alias 0"), new ActivityWindow("activity alias 1")) + new And(new ActivityWindow("activity alias 0"), new ActivityWindow("activity alias 1")) ))) ); } @@ -900,7 +900,7 @@ export default () => { } """, new ViolationsOfWindows( - new Any( + new Or( new WindowsFromSpans( new ForEachActivitySpans( "activity",