Merge pull request #135 from lf-lang/schedule-properly

Add the microstep only when the actions are scheduled at the current tag
lf-lang · Feb 25, 2023 · be7b4f1 · be7b4f1
2 parents 30cbc44 + c039537
commit be7b4f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/__tests__/action.test.ts b/__tests__/action.test.ts
@@ -40,7 +40,7 @@ class ReactorWithFederatePortAction extends App {
 }
 
 describe('Intended tag tests', function () {
-    it('Undefined inteded tag', function() {
+    it('Undefined intended tag', function() {
         intendedTagDelay = undefined
         let app = new ReactorWithFederatePortAction()
         expect(() => app._start()).toThrowError("FederatedPortAction must have an intended tag from RTI.")
@@ -56,7 +56,7 @@ describe('Intended tag tests', function () {
 
     it('Intended tag equal to current tag', function() {
         intendedTagDelay = TimeValue.nsec(10)
-        intendedTagMicrostepDelay = 1
+        intendedTagMicrostepDelay = 0
         let app = new ReactorWithFederatePortAction()
         app.setLastTagProvisional(false)
         expect(() => app._start()).toThrowError("Intended tag must be greater than current tag. Intended tag: ")

diff --git a/src/core/action.ts b/src/core/action.ts
@@ -94,7 +94,7 @@ export abstract class SchedulableAction<T extends Present> implements Sched<T> {
                 Log.debug(this, () => "Using intended tag from RTI, similar to schedule_at_tag(tag) with an intended tag: " +
                 intendedTag);
                 tag = intendedTag;
-            } else {
+            } else if (delay.isEqualTo(TimeValue.zero())) {
                 tag = tag.getMicroStepsLater(1);
             }