If scheduling has not simulated anything, do not store sim results

NASA-AMMOS · Oct 10, 2023 · bb267d1 · bb267d1
1 parent ec5ae50
commit bb267d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/simulation/SimulationFacade.java b/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/simulation/SimulationFacade.java
@@ -81,6 +81,13 @@ public void initialSimulationResultsAreStale(){
     this.initialPlanHasBeenModified = true;
   }
 
+  /**
+   * @return true if initial simulation results are stale, false otherwise
+   */
+  public boolean areInitialSimulationResultsStale(){
+    return this.initialPlanHasBeenModified;
+  }
+
   public Optional<gov.nasa.jpl.aerie.constraints.model.SimulationResults> getLatestConstraintSimulationResults(){
     if(!initialPlanHasBeenModified && initialSimulationResults.isPresent()) return Optional.of(this.initialSimulationResults.get().constraintsResults());
     if(lastSimulationData == null) return Optional.empty();

diff --git a/...src/main/java/gov/nasa/jpl/aerie/scheduler/worker/services/SynchronousSchedulerAgent.java b/...src/main/java/gov/nasa/jpl/aerie/scheduler/worker/services/SynchronousSchedulerAgent.java
@@ -291,6 +291,7 @@ private Optional<DatasetId> storeSimulationResults(PlanningHorizon planningHoriz
                                                      final Map<SchedulingActivityDirective, ActivityDirectiveId> schedDirectiveToMerlinId)
   throws MerlinServiceException, IOException
   {
+    if(!simulationFacade.areInitialSimulationResultsStale()) return Optional.empty();
     //finish simulation until end of horizon before posting results
     try {
       simulationFacade.computeSimulationResultsUntil(planningHorizon.getEndAerie());