diff --git a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SampleProcedure.java b/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SampleProcedure.java index 5f56a43e6c..8e323ace0b 100644 --- a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SampleProcedure.java +++ b/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SampleProcedure.java @@ -5,13 +5,14 @@ import gov.nasa.ammos.aerie.procedural.scheduling.annotations.SchedulingProcedure; import gov.nasa.jpl.aerie.merlin.protocol.types.Duration; import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.DirectiveStart; +import org.jetbrains.annotations.NotNull; import java.util.Map; @SchedulingProcedure public record SampleProcedure(int quantity) implements Goal { @Override - public void run(EditablePlan plan) { + public void run(@NotNull final EditablePlan plan) { final var firstTime = Duration.hours(24); final var step = Duration.hours(6); diff --git a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SimulationDemo.java b/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SimulationDemo.java index bbceb3bde0..5dd0f63af4 100644 --- a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SimulationDemo.java +++ b/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SimulationDemo.java @@ -7,6 +7,7 @@ import gov.nasa.ammos.aerie.procedural.scheduling.plan.EditablePlan; import gov.nasa.ammos.aerie.procedural.timeline.collections.profiles.Real; import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.DirectiveStart; +import org.jetbrains.annotations.NotNull; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; @@ -17,7 +18,7 @@ @SchedulingProcedure public record SimulationDemo(int quantity) implements Goal { @Override - public void run(EditablePlan plan) { + public void run(@NotNull final EditablePlan plan) { // final var firstActivityTime = plan.toRelative(Instant.from(DOY_WITHOUT_ZONE_FORMATTER.parse("2024-128T07:00:00"))); // // plan.create( diff --git a/procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/ops/ParallelOps.kt b/procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/ops/ParallelOps.kt index 24338fdba7..4212ea78bf 100644 --- a/procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/ops/ParallelOps.kt +++ b/procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/ops/ParallelOps.kt @@ -140,8 +140,8 @@ interface ParallelOps, THIS: ParallelOps>: GeneralOp /** [(DOC)][countActive] Returns a [Numbers] profile that corresponds to the number of active objects at any given time. */ fun countActive() = reduceIntoProfile(::Numbers, NullBinaryOperation.reduce( { _, _ -> 1 }, - { _, acc, _ -> acc.toInt() + 1} - )).assignGaps(Numbers(0)) + { _, acc, _ -> acc + 1} + )).assignGaps(0) /** * [(DOC)][accumulatedDuration] Creates a Real profile corresponding to the running total of time diff --git a/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/goals/Procedure.java b/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/goals/Procedure.java index 18a91aada2..90c3ca9f9c 100644 --- a/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/goals/Procedure.java +++ b/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/goals/Procedure.java @@ -25,7 +25,6 @@ import static gov.nasa.jpl.aerie.scheduler.plan.InMemoryEditablePlan.toSchedulingActivityDirective; public class Procedure extends Goal { - // private final gov.nasa.jpl.aerie.scheduling.Procedure procedure; private final Path jarPath; private final SerializedValue args;