|
@@ -9,8 +9,10 @@ import animation.AlgorithmStage;
|
|
|
import animation.BackwardAction;
|
|
|
import animation.PseudoCodeNode;
|
|
|
import animation.PseudoCodeNode.CodeAction;
|
|
|
+import bk.ExtremalLayoutCalc.LayoutType;
|
|
|
import graph.LayeredGraphEdge;
|
|
|
import graph.LayeredGraphNode;
|
|
|
+import lib.TextLayoutHelper;
|
|
|
|
|
|
/**
|
|
|
* the preprocessing stage of the bk node placement algorithm
|
|
@@ -49,9 +51,7 @@ public class ConflictDetection implements AlgorithmStage {
|
|
|
pseudo_line = 1;
|
|
|
}
|
|
|
|
|
|
- // TODO: im psuedocode anzeigen
|
|
|
- // TODO: rekursion auf subgraphen
|
|
|
- // TODO: work with breakpoints
|
|
|
+
|
|
|
@Override
|
|
|
public StageStatus forwardStep() {
|
|
|
int old_line = pseudo_line;
|
|
@@ -292,7 +292,22 @@ public class ConflictDetection implements AlgorithmStage {
|
|
|
|
|
|
@Override
|
|
|
public String getDebugString() {
|
|
|
- return "";
|
|
|
+ String info = "| i | l | l1 | k0 | k1 | k |\n";
|
|
|
+ info += "|----|----|----|----|----|----|\n";
|
|
|
+ info += "|" + TextLayoutHelper.strToLen( "" + i, 4 ) +
|
|
|
+ "|" + TextLayoutHelper.strToLen( "" + l, 4 ) +
|
|
|
+ "|" + TextLayoutHelper.strToLen( "" + l1, 4 ) +
|
|
|
+ "|" + TextLayoutHelper.strToLen( "" + k0, 4 ) +
|
|
|
+ "|" + TextLayoutHelper.strToLen( "" + k1, 4 ) +
|
|
|
+ "|" + TextLayoutHelper.strToLen( "" + k, 4 ) + "|\n";
|
|
|
+// if( insideSubgraph && vIndex < graph.getContainedNodes().size() )
|
|
|
+// {
|
|
|
+// info += "Subgraph of " + graph.getContainedNodes().get( vIndex ).getName() + ":\n";
|
|
|
+// String tmp = subgraphAlgs.get( vIndex ).getDebugString();
|
|
|
+// info += tmp;
|
|
|
+// return info;
|
|
|
+// }
|
|
|
+ return info;
|
|
|
}
|
|
|
|
|
|
/**
|