Commit 8be9c469 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

DSE-SolCon: Remove remaining 1:1 allocation assumptions

Issue-Ref: 3791
Issue-Url: https://af3-developer.fortiss.org/issues/3791

Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parent de92d9ed
PartitionChannelConverter.java de48bab1b37a658093ab18b20bc04f0179a67506 YELLOW
PartitionConverter.java 9e9861618e29cf0cbdcdbaae881ccca2538b1458 YELLOW
PartitionToExecutionUnitConverter.java c6e3c281d5f9bc78db699deeff32362e5f10c758 YELLOW
TaskToPartitionConverter.java b1ff8548aaa344cfe72d104573e6b742a525c51f RED
PartitionToExecutionUnitConverter.java e2b73759498f72277378cfaf1f37a3357742a671 YELLOW
TaskToPartitionConverter.java f71db1ef5488d48ef5e38b0e7c82bdff92d1d269 YELLOW
......@@ -19,7 +19,6 @@ import static java.util.Arrays.asList;
import static org.fortiss.af3.allocation.utils.AllocationModelElementFactory.RIGHT_ARROW;
import static org.fortiss.af3.allocation.utils.AllocationUtils.addAllocationEntry;
import static org.fortiss.af3.partition.util.PartitionModelElementFactory.createPartitionToExecutionUnitAllocationTable;
import static org.fortiss.tooling.common.util.LambdaUtils.getFirst;
import java.util.Collection;
......@@ -66,9 +65,8 @@ public class PartitionToExecutionUnitConverter extends
platArch);
for(PartitionToExecutionUnitAllocationEntry entry : fromSuperSet.getEntries()) {
Partition partition = (Partition)entry.getSourceElement();
// We assume single ExecutionUnits as allocation targets in this place.
addAllocationEntry(table, PartitionToExecutionUnitAllocationEntry.class, partition,
getFirst(entry.getTargetElements()).get());
entry.getTargetElements().forEach(tgt -> addAllocationEntry(table,
PartitionToExecutionUnitAllocationEntry.class, partition, tgt));
}
atc.getContainedElements().add(table);
......
......@@ -19,7 +19,6 @@ import static java.util.Arrays.asList;
import static org.fortiss.af3.allocation.utils.AllocationModelElementFactory.RIGHT_ARROW;
import static org.fortiss.af3.allocation.utils.AllocationUtils.addAllocationEntry;
import static org.fortiss.af3.partition.util.PartitionModelElementFactory.createTaskToPartitionAllocationTable;
import static org.fortiss.tooling.common.util.LambdaUtils.getFirst;
import java.util.Collection;
......@@ -65,9 +64,8 @@ public class TaskToPartitionConverter extends
for(TaskToPartitionAllocationEntry entry : fromSuperSet.getEntries()) {
Partition partition = (Partition)entry.getTargetElement();
// TODO: We assume single Tasks in this place.
addAllocationEntry(table, TaskToPartitionAllocationEntry.class,
getFirst(entry.getSourceElements()).get(), partition);
entry.getSourceElements().forEach(src -> addAllocationEntry(table,
TaskToPartitionAllocationEntry.class, src, partition));
}
atc.getContainedElements().add(table);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment