Merge pull request #1488 from NASA-AMMOS/1336-1468-bug-mutex

Fix rootfinding by enforcing bounds of initial x-values
NASA-AMMOS · Jun 26, 2024 · 0c4a76d · 0c4a76d
2 parents dd27d6a + 33ad9e9
commit 0c4a76d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/EquationSolvingAlgorithms.java b/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/EquationSolvingAlgorithms.java
@@ -131,7 +131,7 @@ private IteratingResult nextValueAt(
       int i = 0;
       do {
         //we should not come back to previously visited values
-        if (!history.alreadyVisited(cur)) {
+        if (!history.alreadyVisited(cur) && cur.between(min, max)) {
           i++;
           try {
             final var value = function.valueAt(cur, history);

diff --git a/scheduler-driver/src/test/java/gov/nasa/jpl/aerie/scheduler/RootfindingTest.java b/scheduler-driver/src/test/java/gov/nasa/jpl/aerie/scheduler/RootfindingTest.java
@@ -127,7 +127,7 @@ public Duration valueAt(
         Duration.of(-2, Duration.SECONDS),
         twoSecond,
         100);
-    assertEquals(29, solution.history().getHistory().size());
+    assertEquals(30, solution.history().getHistory().size());
     assertEquals(new EquationSolvingAlgorithms.FunctionCoordinate<>(Duration.of(0, Duration.MICROSECONDS), Duration.of(0, Duration.MICROSECONDS)), solution.functionCoordinate());
   }
 
@@ -164,7 +164,7 @@ public Duration valueAt(
         Duration.of(-2, Duration.SECONDS),
         twoSecond,
         100);
-    assertEquals(2, solution.history().getHistory().size());
-    assertEquals(new EquationSolvingAlgorithms.FunctionCoordinate<>(Duration.of(0, Duration.MICROSECONDS), Duration.of(0, Duration.MICROSECONDS)), solution.functionCoordinate());
+    assertEquals(1, solution.history().getHistory().size());
+    assertEquals(new EquationSolvingAlgorithms.FunctionCoordinate<>(Duration.of(-860925, Duration.MICROSECONDS), Duration.of(0, Duration.MICROSECONDS)), solution.functionCoordinate());
   }
 }