From 9ad4681da63d202960f7727ca77891ae66bd9e37 Mon Sep 17 00:00:00 2001
From: Michael Schmid <michael3.schmid@oth-regensburg.de>
Date: Thu, 1 Oct 2020 10:36:16 +0200
Subject: [PATCH] minor changes

---
 src/main/java/mvd/jester/App.java                 | 33 +++++++++------------------------
 src/main/java/mvd/jester/model/SystemManager.java |  2 +-
 src/main/java/mvd/jester/tests/SchmidMottok.java  |  1 -
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/main/java/mvd/jester/App.java b/src/main/java/mvd/jester/App.java
index a7faff3..3a6e89d 100644
--- a/src/main/java/mvd/jester/App.java
+++ b/src/main/java/mvd/jester/App.java
@@ -27,20 +27,6 @@ public class App {
             SystemManager<DagTaskBuilder> manager = new SystemManager<>(DagTaskBuilder.class);
             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(
                     new SchmidMottok(new KnownStructureWithMaxThreads(manager), manager),
                     new SchmidMottok(new KnownStructure(), manager),
@@ -51,18 +37,17 @@ public class App {
             te.varyRenyiUtilization(manager, tests, 100);
         }
         // {
-        // SystemManager manager = new SystemManager(8);
-        // DagTaskBuilder builder = new DagTaskBuilder();
-        // TestEnvironment te = new TestEnvironment();
+        //     SystemManager<DagTaskBuilder> manager = new SystemManager<>(DagTaskBuilder.class);
+        //     TestEnvironment te = new TestEnvironment();
 
-        // List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList(
-        // new SchmidMottok(new KnownStructureWithMaxThreads(manager), manager),
-        // new SchmidMottok(new KnownStructure(), manager)
-        // // new MelaniButtazzo(manager)
-        // // , new FonsecaNelis(manager)
-        // ));
+        //     List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList(
+        //     new SchmidMottok(new KnownStructureWithMaxThreads(manager), manager),
+        //     new SchmidMottok(new KnownStructure(), manager)
+        //     // new MelaniButtazzo(manager)
+        //     , new FonsecaNelis(manager)
+        //     ));
 
-        // te.varyUtilization(builder, tests, 8, 500);
+        //     te.varyUtilization(manager, tests, 500);
         // }
         // {
         // SystemManager<DagTaskBuilder> manager = new SystemManager<>(DagTaskBuilder.class);
diff --git a/src/main/java/mvd/jester/model/SystemManager.java b/src/main/java/mvd/jester/model/SystemManager.java
index ef55ca5..cfd4026 100644
--- a/src/main/java/mvd/jester/model/SystemManager.java
+++ b/src/main/java/mvd/jester/model/SystemManager.java
@@ -179,7 +179,7 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface 
         private long maxNumberOfThreads = numberOfProcessors;
         private long depth = 2;
         private long p_par = 80;
-        private long p_add = 20; // TODO: Change back to 0.2
+        private long p_add = 20; 
 
         public DagTaskBuilder() {
         }
diff --git a/src/main/java/mvd/jester/tests/SchmidMottok.java b/src/main/java/mvd/jester/tests/SchmidMottok.java
index 2b25894..9624455 100644
--- a/src/main/java/mvd/jester/tests/SchmidMottok.java
+++ b/src/main/java/mvd/jester/tests/SchmidMottok.java
@@ -11,7 +11,6 @@ import mvd.jester.model.SystemManagerInterface;
 import mvd.jester.model.Task;
 import mvd.jester.priority.PriorityManager;
 import mvd.jester.priority.RateMonotonic;
-import mvd.jester.tests.TypeFunction.KnownStructureWithMaxThreads;
 
 /**
  * SchmidMottok
--
libgit2 0.26.0