Commit 9ad4681d by Michael Schmid

minor changes

parent 43947796
...@@ -27,20 +27,6 @@ public class App { ...@@ -27,20 +27,6 @@ public class App {
SystemManager<DagTaskBuilder> manager = new SystemManager<>(DagTaskBuilder.class); SystemManager<DagTaskBuilder> manager = new SystemManager<>(DagTaskBuilder.class);
TestEnvironment te = new TestEnvironment(); TestEnvironment te = new TestEnvironment();
// SchmidMottok sm = new SchmidMottok(new KnownStructure(), manager);
// JiangYi jy = new JiangYi(manager);
// Set<DagTask> set = manager.getBuilder().generateRenyiTaskSet(7.0);
// final SortedTaskSet<DagTask> rmTasks = new SortedTaskSet<>(sm.getPriorityManager());
// rmTasks.addAll(set);
// final SortedTaskSet<DagTask> edfTasks = new SortedTaskSet<>(jy.getPriorityManager());
// edfTasks.addAll(set);
// jy.runSchedulabilityCheck(edfTasks);
// sm.runSchedulabilityCheck(rmTasks);
List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList( List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList(
new SchmidMottok(new KnownStructureWithMaxThreads(manager), manager), new SchmidMottok(new KnownStructureWithMaxThreads(manager), manager),
new SchmidMottok(new KnownStructure(), manager), new SchmidMottok(new KnownStructure(), manager),
...@@ -51,18 +37,17 @@ public class App { ...@@ -51,18 +37,17 @@ public class App {
te.varyRenyiUtilization(manager, tests, 100); te.varyRenyiUtilization(manager, tests, 100);
} }
// { // {
// SystemManager manager = new SystemManager(8); // SystemManager<DagTaskBuilder> manager = new SystemManager<>(DagTaskBuilder.class);
// DagTaskBuilder builder = new DagTaskBuilder();
// TestEnvironment te = new TestEnvironment(); // TestEnvironment te = new TestEnvironment();
// List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList( // List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList(
// new SchmidMottok(new KnownStructureWithMaxThreads(manager), manager), // new SchmidMottok(new KnownStructureWithMaxThreads(manager), manager),
// new SchmidMottok(new KnownStructure(), manager) // new SchmidMottok(new KnownStructure(), manager)
// // new MelaniButtazzo(manager) // // new MelaniButtazzo(manager)
// // , new FonsecaNelis(manager) // , new FonsecaNelis(manager)
// )); // ));
// te.varyUtilization(builder, tests, 8, 500); // te.varyUtilization(manager, tests, 500);
// } // }
// { // {
// SystemManager<DagTaskBuilder> manager = new SystemManager<>(DagTaskBuilder.class); // SystemManager<DagTaskBuilder> manager = new SystemManager<>(DagTaskBuilder.class);
......
...@@ -179,7 +179,7 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -179,7 +179,7 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
private long maxNumberOfThreads = numberOfProcessors; private long maxNumberOfThreads = numberOfProcessors;
private long depth = 2; private long depth = 2;
private long p_par = 80; private long p_par = 80;
private long p_add = 20; // TODO: Change back to 0.2 private long p_add = 20;
public DagTaskBuilder() { public DagTaskBuilder() {
} }
......
...@@ -11,7 +11,6 @@ import mvd.jester.model.SystemManagerInterface; ...@@ -11,7 +11,6 @@ import mvd.jester.model.SystemManagerInterface;
import mvd.jester.model.Task; import mvd.jester.model.Task;
import mvd.jester.priority.PriorityManager; import mvd.jester.priority.PriorityManager;
import mvd.jester.priority.RateMonotonic; import mvd.jester.priority.RateMonotonic;
import mvd.jester.tests.TypeFunction.KnownStructureWithMaxThreads;
/** /**
* SchmidMottok * SchmidMottok
......
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 sign in to comment