Commit 3a8263c2 authored by Alexander Diewald's avatar Alexander Diewald

Merge remote-tracking branch 'origin/master' into 3746

parents f2d81ddf 0fa82a6f
Z3Backend.java f9cb53217d533e7014cc32fceee9d6922d145f4e YELLOW
Z3Backend.java f9cb53217d533e7014cc32fceee9d6922d145f4e GREEN
BasicDeploScheduleConstraint.java ddce0b969b26f1b1cc6a9b2912459a2756acd4ff YELLOW
BasicDeploScheduleConstraint.java e7d70587a7500b368100d31ea9944a43da491af0 GREEN
BasicDeploymentConstraint.java f66c59adfa5a1619db1f1178c95fe7a4b7930d6e GREEN
BasicScheduleConstraint.java 8c64023fd01bcf858218e322f020aceff3661d98 GREEN
ConstraintDefinitionUtils.java a51705fb421fd2d1d3c2a9b74a055947f7e70e98 GREEN
......
......@@ -487,7 +487,6 @@ public class BasicDeploScheduleConstraint {
List<IBooleanExpression> assertions = new ArrayList<>();
// retrieves the wcet table
Task task = getFirst(taskSS.getEntries()).get();
TaskWcetTable taskWcetTable = getFirst(taskWcets.getEntries()).get();
for(ResourceAllocation currentRA : resAllocSS.getEntries()) {
......
......@@ -5,5 +5,5 @@ DSMLUtils.java c07eeef09787cea9db98533d346e3e384a232593 GREEN
ExplorationModelElementFactory.java bb48b2d09b92efcb1b2d3e382555089bb7ed5db5 GREEN
ExplorationReflectionUtils.java 62731e1cef32fe93f2c2017f93f5ba1f054d5197 GREEN
ExplorationUtils.java 3e317c851bd1a0b48fbec3fdbe039d8b66506c51 GREEN
ModelSnapshotExtractUtils.java dde8b42c5a7228478ffe8c67820bcac91e875562 YELLOW
ModelSnapshotExtractUtils.java dde8b42c5a7228478ffe8c67820bcac91e875562 GREEN
PatternFactoryUtils.java 6b3c61d421258967af94ce019fdb778e3161c90d GREEN
......@@ -10,4 +10,4 @@ TaskParameterTableStaticImpl.java b646b9201432074bec0a1b0c408255b982474b32 GREEN
TaskPortToTransceiverAllocationEntryStaticImpl.java 0ac11438943e72798330e76caff50782d1970cb4 GREEN
TaskToExecutionUnitAllocationEntryStaticImpl.java ed6b5d4e28a2f445d71890b5e5718717b8457796 GREEN
TaskToExecutionUnitAllocationTableStaticImpl.java 34ea0a9a476bb2527cf0114871073ce25c0df09c GREEN
TaskWcetTableStaticImpl.java 2766f7371d9d6810526c52f7b446ca60f4ef19dd GREEN
TaskWcetTableStaticImpl.java e15f883abb1c47dd189916c947869cffe20d9472 GREEN
......@@ -17,7 +17,6 @@ package org.fortiss.af3.task.model.allocation.impl;
import static java.math.BigDecimal.valueOf;
import static org.fortiss.tooling.base.utils.AnnotationUtils.getAnnotation;
import static org.fortiss.tooling.base.utils.AnnotationUtils.hasAnnotation;
import static org.fortiss.tooling.kernel.utils.EcoreUtils.convertList;
import java.math.BigDecimal;
......@@ -57,14 +56,14 @@ public class TaskWcetTableStaticImpl {
wcet = getWcet(task);
}
if(!hasAnnotation(executionUnit, Frequency.class)) {
Frequency freq = getAnnotation(executionUnit, Frequency.class);
if(freq == null || freq.getBaseFrequencyHz() == null) {
return wcet;
}
Frequency freq = getAnnotation(executionUnit, Frequency.class);
baseFrequency = freq.getBaseFrequencyHz();
// Check base frequency and if provided frequency is valid for the given execution unit
if(baseFrequency == null || !freq.getFrequenciesHz().contains(frequency)) {
// Check if provided frequency is valid for the given execution unit
if(!freq.getFrequenciesHz().contains(frequency)) {
return null;
}
// Scale WCET to provided frequency (relative to base frequency)
......
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