From 9809bc744812c44842deaacbc26af7feec63d47c Mon Sep 17 00:00:00 2001 From: Michael Schmid Date: Wed, 5 Aug 2020 12:09:24 +0200 Subject: [PATCH] Last changes --- src/main/java/mvd/jester/tests/SchmidMottok.java | 3 --- src/test/java/mvd/jester/priority/TestEarliestDeadlineFirst.java | 3 ++- src/test/java/mvd/jester/priority/TestRateMonotonic.java | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/mvd/jester/tests/SchmidMottok.java b/src/main/java/mvd/jester/tests/SchmidMottok.java index 98f7368..82396ba 100644 --- a/src/main/java/mvd/jester/tests/SchmidMottok.java +++ b/src/main/java/mvd/jester/tests/SchmidMottok.java @@ -1,14 +1,11 @@ package mvd.jester.tests; -import java.math.RoundingMode; import java.util.HashMap; import java.util.Map; import java.util.Set; -import com.google.common.math.LongMath; import mvd.jester.info.SchedulingInfo; import mvd.jester.info.TerminationInfo; import mvd.jester.model.DagTask; -import mvd.jester.model.Segment; import mvd.jester.model.SortedTaskSet; import mvd.jester.model.SystemManager; import mvd.jester.model.Task; diff --git a/src/test/java/mvd/jester/priority/TestEarliestDeadlineFirst.java b/src/test/java/mvd/jester/priority/TestEarliestDeadlineFirst.java index cd8a721..341ae7f 100644 --- a/src/test/java/mvd/jester/priority/TestEarliestDeadlineFirst.java +++ b/src/test/java/mvd/jester/priority/TestEarliestDeadlineFirst.java @@ -14,6 +14,7 @@ import mvd.jester.simulator.internals.parallelsynchronous.TaskContext; import mvd.jester.tests.ChwaLee; import mvd.jester.tests.MaiaBertogna; import mvd.jester.tests.SchmidMottok; +import mvd.jester.tests.TypeFunction; /** * TestEarliestDeadlineFirst @@ -56,7 +57,7 @@ public class TestEarliestDeadlineFirst { assertTrue(edf.hasSimulator(DynamicForkJoin.class)); assertTrue(edf.hasTest(new ChwaLee(manager))); - assertFalse(edf.hasTest(new SchmidMottok(manager))); + assertFalse(edf.hasTest(new SchmidMottok(new TypeFunction.KownStructure(), manager))); assertFalse(edf.hasTest(new MaiaBertogna(manager))); // assertTrue(edf.hasSimulator(new ParallelSynchronous(mock(SystemSetup.class)))); // assertTrue(edf.hasSimulator(new DynamicForkJoin(mock(SystemSetup.class)))); diff --git a/src/test/java/mvd/jester/priority/TestRateMonotonic.java b/src/test/java/mvd/jester/priority/TestRateMonotonic.java index 7b616b4..43970cc 100644 --- a/src/test/java/mvd/jester/priority/TestRateMonotonic.java +++ b/src/test/java/mvd/jester/priority/TestRateMonotonic.java @@ -14,6 +14,7 @@ import mvd.jester.simulator.internals.parallelsynchronous.TaskContext; import mvd.jester.tests.ChwaLee; import mvd.jester.tests.MaiaBertogna; import mvd.jester.tests.SchmidMottok; +import mvd.jester.tests.TypeFunction; /** * TestRateMonotonic @@ -55,7 +56,7 @@ public class TestRateMonotonic { assertTrue(rm.hasSimulator(DynamicForkJoin.class)); assertFalse(rm.hasTest(new ChwaLee(manager))); - assertTrue(rm.hasTest(new SchmidMottok(manager))); + assertTrue(rm.hasTest(new SchmidMottok(new TypeFunction.UnkownStructure(), manager))); assertTrue(rm.hasTest(new MaiaBertogna(manager))); // assertTrue(rm.hasSimulator(new ParallelSynchronous(mock(SystemSetup.class)))); // assertTrue(rm.hasSimulator(new DynamicForkJoin(mock(SystemSetup.class)))); -- libgit2 0.26.0