Minor edits

NASA-AMMOS · Sep 5, 2024 · 9d989f4 · 9d989f4
1 parent 2475d93
commit 9d989f4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...va/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SampleProcedure.java b/...va/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/...ava/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SimulationDemo.java b/...ava/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/...ural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/ops/ParallelOps.kt b/...ural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/ops/ParallelOps.kt
@@ -140,8 +140,8 @@ interface ParallelOps<T: IntervalLike<T>, THIS: ParallelOps<T, THIS>>: 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