From 956c25517bdb05bf47935497c73adf7aa7a10f3a Mon Sep 17 00:00:00 2001 From: Michael Schmid Date: Tue, 16 Jul 2019 10:14:16 +0200 Subject: [PATCH] Found error in my model, commit before working --- src/main/java/mvd/jester/tests/MaiaBertogna.java | 2 +- src/main/java/mvd/jester/tests/SchmidMottok.java | 1 - src/main/java/mvd/jester/tests/TestEnvironment.java | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/mvd/jester/tests/MaiaBertogna.java b/src/main/java/mvd/jester/tests/MaiaBertogna.java index 96b1483..aefa137 100644 --- a/src/main/java/mvd/jester/tests/MaiaBertogna.java +++ b/src/main/java/mvd/jester/tests/MaiaBertogna.java @@ -81,7 +81,7 @@ public class MaiaBertogna extends AbstractTest { for (Segment s : task.getSegments()) { if (s.getNumberOfJobs() >= parallelism + 1) { - s.getJobWcet(); + interference += s.getJobWcet(); } } diff --git a/src/main/java/mvd/jester/tests/SchmidMottok.java b/src/main/java/mvd/jester/tests/SchmidMottok.java index 62d2d84..b87bc7a 100644 --- a/src/main/java/mvd/jester/tests/SchmidMottok.java +++ b/src/main/java/mvd/jester/tests/SchmidMottok.java @@ -44,7 +44,6 @@ public class SchmidMottok extends AbstractTest { long responseTime = minimumWcet; long previousResponseTime = 0; - do { previousResponseTime = responseTime; long interference = 0; diff --git a/src/main/java/mvd/jester/tests/TestEnvironment.java b/src/main/java/mvd/jester/tests/TestEnvironment.java index f239787..4a18ebd 100644 --- a/src/main/java/mvd/jester/tests/TestEnvironment.java +++ b/src/main/java/mvd/jester/tests/TestEnvironment.java @@ -62,7 +62,6 @@ public class TestEnvironment { checkedTasksets++; long roundedUtilization = (long) (utilization * 10); - for (AbstractTest t : testCases) { if (t.runSchedulabilityCheck()) { results.computeIfAbsent(roundedUtilization, @@ -82,7 +81,7 @@ public class TestEnvironment { private void logResults(Set testCases, Map> results) { LocalTime date = LocalTime.now(); - Logger log = new Logger("results_" + systemSetup.getNumberOfProcessors() + "_" + Logger log = new Logger("./results/results_" + systemSetup.getNumberOfProcessors() + "_" + date.getHour() + ":" + date.getMinute() + ".txt"); String firstLine = new String("Utilization"); -- libgit2 0.26.0