Trace effects on traced CellResources

NASA-AMMOS · Dec 8, 2023 · 47c7539 · 47c7539
1 parent 711a240
commit 47c7539
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/contrib/src/main/java/gov/nasa/jpl/aerie/contrib/streamline/debugging/Tracing.java b/contrib/src/main/java/gov/nasa/jpl/aerie/contrib/streamline/debugging/Tracing.java
@@ -7,6 +7,7 @@
 import gov.nasa.jpl.aerie.contrib.streamline.core.Expiring;
 import gov.nasa.jpl.aerie.contrib.streamline.core.Resource;
 import gov.nasa.jpl.aerie.merlin.framework.Condition;
+import gov.nasa.jpl.aerie.merlin.protocol.types.Unit;
 
 import java.util.Stack;
 import java.util.function.Supplier;
@@ -47,7 +48,11 @@ public static <D extends Dynamics<?, D>> CellResource<D> trace(Supplier<String>
 
       @Override
       public void emit(final DynamicsEffect<D> effect) {
-        resource.emit(effect);
+        traceAction(
+                () -> String.format("Emit '%s' on %s",
+                        Naming.getName(effect).orElse("anonymous effect"),
+                        name.get()),
+                () -> { resource.emit(effect); return Unit.UNIT; });
       }
 
       @Override

diff --git a/...asa/jpl/aerie/contrib/streamline/modeling/polynomial/LinearBoundaryConsistencySolver.java b/...asa/jpl/aerie/contrib/streamline/modeling/polynomial/LinearBoundaryConsistencySolver.java
@@ -131,7 +131,7 @@ private void solve() {
           if (domainChanged) {
             if (D.isEmpty()) {
               throw new IllegalStateException(
-                  "LinearArcConsistencySolver %s failed. Domain for %s is empty: [%s, %s]".formatted(
+                  "LinearBoundaryConsistencySolver %s failed. Domain for %s is empty: [%s, %s]".formatted(
                       getName(this).orElseThrow(), D.variable, D.lowerBound, D.upperBound));
             }
             // TODO: Make this more efficient by not adding constraints that are already in the queue.