Merge pull request #198 from lf-lang/ts-cyclic-dependencies

Handle cyclic dependencies by applying the `MLAA` based execution and `TPO level`

__tests__/action.test.ts

@@ -51,7 +51,7 @@ describe("Intended tag tests", function () {
     const app = new ReactorWithFederatePortAction();
     expect(() => {
       app._start();
-    }).toThrowError("FederatedPortAction must have an intended tag from RTI.");
+    }).toThrowError("No intended tag given while attempting to schedule an event coming from another federate.");
   });
 
   it("Intended tag smaller than current tag", function () {

__tests__/time.test.ts

@@ -310,12 +310,12 @@ describe("add time value", function () {
     expect(
       new Tag(oneThousandMS, 0)
         .getLaterTag(straightZero)
-        .isSimultaneousWith(new Tag(oneThousandMS, 0))
+        .isSimultaneousWith(new Tag(oneThousandMS, 1))
     ).toBeTruthy();
     expect(
       new Tag(oneThousandMS, 1)
         .getLaterTag(straightZero)
-        .isSimultaneousWith(new Tag(oneThousandMS, 1))
+        .isSimultaneousWith(new Tag(oneThousandMS, 2))
     ).toBeTruthy();
   });
 

lingua-franca-ref.txt

@@ -1 +1 @@
-master
+ts-cyclic-dependencies

src/core/action.ts

@@ -79,20 +79,11 @@ export class Action<T> extends ScheduledTrigger<T> implements Read<T> {
       tag = tag.getLaterTag(delay);
 
       if (this.action.origin === Origin.physical) {
-        // If the resulting timestamp from delay is less than the current physical time
-        // on the platform, then the timestamp becomes the current physical time.
-        // Otherwise the tag is computed like a logical action's tag.
-
-        const physicalTime = getCurrentPhysicalTime();
-        if (tag.time.isEarlierThan(physicalTime)) {
-          tag = new Tag(getCurrentPhysicalTime(), 0);
-        } else {
-          tag = tag.getMicroStepsLater(1);
-        }
+        tag = new Tag(getCurrentPhysicalTime(), 0).getLaterTag(delay);
       } else if (this.action instanceof FederatePortAction) {
         if (intendedTag === undefined) {
           throw new Error(
-            "FederatedPortAction must have an intended tag from RTI."
+            "No intended tag given while attempting to schedule an event coming from another federate."
           );
         }
         if (
@@ -132,8 +123,6 @@ export class Action<T> extends ScheduledTrigger<T> implements Read<T> {
             )}`
         );
         tag = intendedTag;
-      } else if (delay.isEqualTo(TimeValue.zero())) {
-        tag = tag.getMicroStepsLater(1);
       }
 
       Log.debug(
@@ -198,7 +187,7 @@ export class FederatePortAction<T> extends Action<T> {
   constructor(
     __parent__: Reactor,
     origin: Origin,
-    minDelay: TimeValue = TimeValue.secs(0)
+    minDelay: TimeValue = TimeValue.zero()
   ) {
     super(__parent__, origin, minDelay);
   }