Commit da04ff1c by Michael Schmid

small changes in edge generation

parent 1b8a538a
...@@ -365,11 +365,13 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -365,11 +365,13 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
jobDag.addVertex(source); jobDag.addVertex(source);
jobDag.addVertex(sink); jobDag.addVertex(sink);
for (Job j : jobDag) { for (Job j : jobDag) {
if (jobDag.inDegreeOf(j) == 0) { if (j != source && j != sink) {
edgePairs.put(source, j); if (jobDag.inDegreeOf(j) == 0) {
} edgePairs.put(source, j);
if (jobDag.outDegreeOf(j) == 0) { }
edgePairs.put(j, sink); if (jobDag.outDegreeOf(j) == 0) {
edgePairs.put(j, sink);
}
} }
} }
......
...@@ -27,7 +27,6 @@ import mvd.jester.model.TreeJob; ...@@ -27,7 +27,6 @@ import mvd.jester.model.TreeJob;
import mvd.jester.utils.DagUtils; import mvd.jester.utils.DagUtils;
import mvd.jester.priority.DeadlineMonotonic; import mvd.jester.priority.DeadlineMonotonic;
import mvd.jester.priority.PriorityManager; import mvd.jester.priority.PriorityManager;
import mvd.jester.priority.RateMonotonic;
import mvd.jester.utils.BinaryDecompositionTree; import mvd.jester.utils.BinaryDecompositionTree;
import mvd.jester.utils.BinaryDecompositionTree.Node; import mvd.jester.utils.BinaryDecompositionTree.Node;
import mvd.jester.utils.BinaryDecompositionTree.NodeType; import mvd.jester.utils.BinaryDecompositionTree.NodeType;
......
...@@ -13,7 +13,6 @@ import mvd.jester.model.SystemManagerInterface; ...@@ -13,7 +13,6 @@ import mvd.jester.model.SystemManagerInterface;
import mvd.jester.model.Task; import mvd.jester.model.Task;
import mvd.jester.priority.DeadlineMonotonic; import mvd.jester.priority.DeadlineMonotonic;
import mvd.jester.priority.PriorityManager; import mvd.jester.priority.PriorityManager;
import mvd.jester.priority.RateMonotonic;
/** /**
* SchmidMottok * SchmidMottok
......
...@@ -136,6 +136,7 @@ public class UeterAgrawal extends AbstractTest<DagTask> { ...@@ -136,6 +136,7 @@ public class UeterAgrawal extends AbstractTest<DagTask> {
return false; return false;
} }
@SuppressWarnings("unused")
private boolean firstFitBinPackingOfTask(List<Double> bins, Task task) { private boolean firstFitBinPackingOfTask(List<Double> bins, Task task) {
Collections.sort(bins); Collections.sort(bins);
Collections.reverse(bins); Collections.reverse(bins);
...@@ -148,6 +149,7 @@ public class UeterAgrawal extends AbstractTest<DagTask> { ...@@ -148,6 +149,7 @@ public class UeterAgrawal extends AbstractTest<DagTask> {
return false; return false;
} }
@SuppressWarnings("unused")
private boolean worstFitBinPackingOfTask(List<Double> bins, Task task) { private boolean worstFitBinPackingOfTask(List<Double> bins, Task task) {
Collections.sort(bins); Collections.sort(bins);
if (bins.get(0) + task.getDensity() <= 1) { if (bins.get(0) + task.getDensity() <= 1) {
......
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