Commit 9a736bd1 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

YELLOW: Fix merge errors

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

Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parent 1fe806b8
AnnotationGenerationUtils.java 6c88aac44bde4a5bdf04a66c6462af9a50f0191a YELLOW
CompArchGeneratonUtil.java 0f1e3c048884fa4df6a35b6a110c46da58f59857 GREEN
DseUtils.java a81ea035e8a51a1df5b07f8efd98efddf192649e YELLOW
DseUtils.java 5d6293890751259d681ebac80b335f2eeb488f60 YELLOW
FileWriterUtil.java 4a95559f571d41fa44e6236fc055ab5baac7c384 GREEN
GraphGenerationUtilities.java e637fd6a38339c60a6a7ac5af116db304266d345 GREEN
GraphMetricUtils.java 99a398d4ff9b15b3eeb35748e32aa34a9b197f07 GREEN
......
......@@ -72,7 +72,6 @@ import org.fortiss.af3.platform.model.annotation.RamSize;
import org.fortiss.af3.project.model.FileProject;
import org.fortiss.af3.task.model.Task;
import org.fortiss.af3.task.model.TaskArchitecture;
import org.fortiss.af3.task.model.allocation.TaskToExecutionUnitAllocationEntry;
import org.fortiss.af3.task.model.annotation.FlashRequirement;
import org.fortiss.af3.task.model.annotation.RamRequirement;
import org.fortiss.af3.timing.model.TimingSpecification;
......@@ -138,9 +137,8 @@ public class DseUtils {
ModelSnapshot allocSnap = createAllocationTableCollectionSnapshot(
firstOfType(copiedRootElements, AllocationTableCollection.class).get());
ModelSnapshot timeSnap = ModelSnapshotExtractUtils.createTimingSpecificationSnapshot(
Optional.of(allocSnap.getSuperSet(TaskToExecutionUnitAllocationEntry.class)),
taSnap.getSuperSet(Task.class), paSnap.getSuperSet(Route.class), Optional.empty(),
firstOfType(copiedRootElements, TimingSpecification.class).get());
Optional.empty(), taSnap.getSuperSet(Task.class), paSnap.getSuperSet(Route.class),
Optional.empty(), firstOfType(copiedRootElements, TimingSpecification.class).get());
inputDefStep.addSnapshot(caSnap);
inputDefStep.addSnapshot(paSnap);
......@@ -183,9 +181,11 @@ public class DseUtils {
expression = createAnd(expression, createUtilizationPatternExpression(dse,
FLASH_MAX_UTIL, executionUnit, RamRequirement.class, RamSize.class));
}
IExplorationConstraint<Boolean> constr = createExplorationConstraint(Boolean.class,
createResourceDimension(), expression,
"Max Flash Util " + FLASH_MAX_UTIL * 100.0 + " of all ExecutionUnits.", false);
@SuppressWarnings("unchecked") IExplorationConstraint<Boolean> constr =
createExplorationConstraint(Boolean.class, createResourceDimension(),
newHashSet(IDeploymentSynthesis.class), expression,
"Max Flash Util " + FLASH_MAX_UTIL * 100.0 + " of all ExecutionUnits.",
false);
if(!constraints.isEmpty()) {
RuleSet flashRuleSet = createRuleSet("Flash constraints", "Generated", "");
......
Supports Markdown
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