- AllocationToSchedule: Link input AllocationTableCollection in generated SystemSchedule

- ScheduleRun: Generate constraints required for weak causality only for Tasks where only weakly causal Components are mapped
refs 3343

org.fortiss.af3.exploration.smt/trunk/src/org/fortiss/af3/exploration/smt/modeltransformation/ScheduleRun.java

@@ -39,6 +39,7 @@ import java.util.stream.Collectors;
 import javax.activation.UnsupportedDataTypeException;
 
 import org.eclipse.emf.common.util.EList;
+import org.fortiss.af3.component.model.Component;
 import org.fortiss.af3.efficientdeployment.model.ExplorationSpecificationSubSet;
 import org.fortiss.af3.exploration.dsl_v2.model.arithmetic.ArithmeticLiteral;
 import org.fortiss.af3.exploration.dsl_v2.model.arithmetic.IArithmeticExpression;
@@ -77,6 +78,7 @@ import org.fortiss.af3.schedule.model.SystemSchedule;
 import org.fortiss.af3.schedule.utils.ScheduleUtils;
 import org.fortiss.af3.task.model.Task;
 import org.fortiss.af3.task.model.TaskOutputPort;
+import org.fortiss.af3.task.model.allocation.ComponentToTaskAllocationTable;
 import org.fortiss.tooling.base.model.element.IConnection;
 import org.fortiss.tooling.base.model.element.IModelElement;
 import org.fortiss.tooling.kernel.utils.EcoreUtils;
@@ -408,6 +410,22 @@ public class ScheduleRun extends SolverRun {
 		return assertions;
 	}
 
+	/**
+	 * Predicate if the given {@link Task} is strongly causal, i.e. if at least of the logical
+	 * {@link Component}s allocated to it is strongly causal.
+	 */
+	private static boolean isStronglyCausal(Task task, ComponentToTaskAllocationTable ca2ta) {
+		if(ca2ta == null) {
+			return false;
+		}
+		for(Component component : ca2ta.getComponents(task)) {
+			if(component.isStronglyCausal()) {
+				return true;
+			}
+		}
+		return true;
+	}
+
 	/** Creates the (FOCUS) causality constraints of the given schedule (strong vs. weak causal). */
 	public static List<IBooleanExpression> createCausalityConstraints(SystemSchedule schedule) {
 		List<IBooleanExpression> assertions = new ArrayList<>();
@@ -418,6 +436,10 @@ public class ScheduleRun extends SolverRun {
 						.filter(s -> (s instanceof ResourceSchedule && ((ResourceSchedule)s)
 								.getResource() instanceof TransmissionUnit))
 						.collect(Collectors.toList());
+		ComponentToTaskAllocationTable ca2ta =
+				schedule.getAllocationTableCollection().getAllocationTable(
+						ComponentToTaskAllocationTable.class);
+
 		for(Schedule s : collect) {
 			for(ResourceAllocation signal : s.getResourceAllocationList()) {
 				TaskOutputPort modelElement =
@@ -425,64 +447,64 @@ public class ScheduleRun extends SolverRun {
 				Task sourceTask = (Task)modelElement.getOwner();// tComponent();
 				ResourceAllocation resourceAllocationSource =
 						ScheduleUtils.getResourceAllocation(schedule, sourceTask);
-				// if(!sourceTask.isStronglyCausal()) {
-				// considering everything weakly causal for the moment!
-				for(IConnection oc : modelElement.getOutgoing()) {
-					Task targetTask = (Task)oc.getTarget().getOwner();
-					ResourceAllocation resourceAllocationTarget =
-							ScheduleUtils.getResourceAllocation(schedule, targetTask);
-					if(resourceAllocationTarget == null) {
-						// skip if there is no target task
-						continue;
+				if(!isStronglyCausal(sourceTask, ca2ta)) {
+					for(IConnection oc : modelElement.getOutgoing()) {
+						Task targetTask = (Task)oc.getTarget().getOwner();
+						ResourceAllocation resourceAllocationTarget =
+								ScheduleUtils.getResourceAllocation(schedule, targetTask);
+						if(resourceAllocationTarget == null) {
+							// skip if there is no target task
+							continue;
+						}
+
+						ForAll forAll1 = createForAll();
+						Set<IModelElement> set1 =
+								DSMLModelElementFactory
+										.createSet("sourceTask", IModelElement.class);
+						set1.getEntries().add(resourceAllocationSource);
+						forAll1.setSet(set1);
+						ForAll forAll2 = createForAll();
+						Set<IModelElement> set2 =
+								DSMLModelElementFactory.createSet("destinationTask",
+										IModelElement.class);
+						set2.getEntries().add(resourceAllocationTarget);
+						forAll2.setSet(set2);
+						ForAll forAll3 = createForAll();
+						Set<IModelElement> set3 =
+								DSMLModelElementFactory.createSet("mSignal", IModelElement.class);
+						set3.getEntries().add(signal);
+						forAll3.setSet(set3);
+
+						ModelElementPropertyLiteral t1Start =
+								createElementPropertyLiteral(set1, StartTimeDummy.class);
+						ModelElementPropertyLiteral t1Duration =
+								createElementPropertyLiteral(set1, DurationDummy.class);
+						Plus t1End = createPlus(t1Start, t1Duration);
+
+						ModelElementPropertyLiteral s1Start =
+								createElementPropertyLiteral(set3, StartTimeDummy.class);
+						ModelElementPropertyLiteral s1Start2 =
+								createElementPropertyLiteral(set3, StartTimeDummy.class);
+						ModelElementPropertyLiteral s1Duration =
+								createElementPropertyLiteral(set3, DurationDummy.class);
+						Plus s1End = createPlus(s1Start, s1Duration);
+
+						ModelElementPropertyLiteral t2Start =
+								createElementPropertyLiteral(set2, StartTimeDummy.class);
+
+						LessEqual lessEqual1 = createLessEqual(t1End, s1Start2);
+						LessEqual lessEqual2 = createLessEqual(s1End, t2Start);
+
+						And and = createAnd(lessEqual1, lessEqual2);
+
+						forAll1.setExpression(forAll2);
+						forAll2.setExpression(forAll3);
+						forAll3.setExpression(and);
+
+						assertions.add(forAll1);
 					}
-
-					ForAll forAll1 = createForAll();
-					Set<IModelElement> set1 =
-							DSMLModelElementFactory.createSet("sourceTask", IModelElement.class);
-					set1.getEntries().add(resourceAllocationSource);
-					forAll1.setSet(set1);
-					ForAll forAll2 = createForAll();
-					Set<IModelElement> set2 =
-							DSMLModelElementFactory.createSet("destinationTask",
-									IModelElement.class);
-					set2.getEntries().add(resourceAllocationTarget);
-					forAll2.setSet(set2);
-					ForAll forAll3 = createForAll();
-					Set<IModelElement> set3 =
-							DSMLModelElementFactory.createSet("mSignal", IModelElement.class);
-					set3.getEntries().add(signal);
-					forAll3.setSet(set3);
-
-					ModelElementPropertyLiteral t1Start =
-							createElementPropertyLiteral(set1, StartTimeDummy.class);
-					ModelElementPropertyLiteral t1Duration =
-							createElementPropertyLiteral(set1, DurationDummy.class);
-					Plus t1End = createPlus(t1Start, t1Duration);
-
-					ModelElementPropertyLiteral s1Start =
-							createElementPropertyLiteral(set3, StartTimeDummy.class);
-					ModelElementPropertyLiteral s1Start2 =
-							createElementPropertyLiteral(set3, StartTimeDummy.class);
-					ModelElementPropertyLiteral s1Duration =
-							createElementPropertyLiteral(set3, DurationDummy.class);
-					Plus s1End = createPlus(s1Start, s1Duration);
-
-					ModelElementPropertyLiteral t2Start =
-							createElementPropertyLiteral(set2, StartTimeDummy.class);
-
-					LessEqual lessEqual1 = createLessEqual(t1End, s1Start2);
-					LessEqual lessEqual2 = createLessEqual(s1End, t2Start);
-
-					And and = createAnd(lessEqual1, lessEqual2);
-
-					forAll1.setExpression(forAll2);
-					forAll2.setExpression(forAll3);
-					forAll3.setExpression(and);
-
-					assertions.add(forAll1);
 				}
 			}
-			// }
 		}
 
 		return assertions;

org.fortiss.af3.exploration.smt/trunk/src/org/fortiss/af3/exploration/smt/util/AllocationToSchedule.java

@@ -87,6 +87,8 @@ public class AllocationToSchedule {
 			}
 		}
 		generateAllIDs(systemSchedule);
+
+		systemSchedule.setAllocationTableCollection(ta2hw.getAllocationTableCollection());
 		return systemSchedule;
 	}
 
@@ -180,9 +182,8 @@ public class AllocationToSchedule {
 		}
 
 		List<TransmissionUnit> transmissionUnits =
-				PlatformArchitectureUtils
-						.findAtomicTransmissionUnits((PlatformArchitecture)ta2hw
-								.getTargetView());
+				PlatformArchitectureUtils.findAtomicTransmissionUnits((PlatformArchitecture)ta2hw
+						.getTargetView());
 		for(TransmissionUnit ts : transmissionUnits) {
 			List<IHierarchicElement> connectedElements =
 					PlatformArchitectureUtils.getConnectedElements(ts);