added debug info for block calc

src/bk/BKNodePlacement.java

@@ -17,7 +17,6 @@ import codelines.FunctionCall;
 import codelines.FunctionDefinition;
 import codelines.Kommentar;
 import codelines.SetVariable;
-import graph.LayeredGraphEdge;
 import graph.LayeredGraphNode;
 import lib.TextLayoutHelper;
 
@@ -84,7 +83,6 @@ public class BKNodePlacement extends AnimatedAlgorithm {
         root.setSelected( true );
     	
         PseudoCodeNode conflictDetectionFunction = new ConflictDetection( this ).createPseudocodeTree( tree );
-        @SuppressWarnings("serial")
         PseudoCodeNode calcLayout = new PseudoCodeNode( TextLayoutHelper.setupPseudoCode( "function calcLayout( layout, graph )", vars ), tree, new FunctionDefinition( vars ) );
         PseudoCodeNode combine = new Combine().createPseudocodeTree( tree );
         root.add( mainFunction );

src/bk/BlockCalc.java

@@ -62,36 +62,20 @@ public class BlockCalc implements AlgorithmStage {
                 }
                 if( m.isSomewhereDefined( "i", MemoryType.LOCAL ) && m.isSomewhereDefined( "k", MemoryType.LOCAL ) )
                     m.<LayeredGraphNode>read( "graph", MemoryType.LOCAL).getContainedLayers().get(m.read( "i", MemoryType.LOCAL )).get(m.<Integer>read( "k", MemoryType.LOCAL ) ).setSelected( LayoutType.fromString( m.read( "layout", MemoryType.LOCAL ) ) );
-                String info = "| i  | l  | l1 | k0 | k1 |  v  |  n  |\n";
-                info +=       "|----|----|----|----|----|-----|-----|\n";
-                String i = "null";
-                String l = "null";
-                String l1 = "null";
-                String k0 = "null";
-                String k1 = "null";
-                String v = "null";
-                String n = "null";
-                if( m.isSomewhereDefined( "i", MemoryType.LOCAL ) )
-                    i = "" + m.<Integer>read( "i", MemoryType.LOCAL );
-                if( m.isSomewhereDefined( "l", MemoryType.LOCAL ) )
-                    l = "" + m.<Integer>read( "l", MemoryType.LOCAL );
-                if( m.isSomewhereDefined( "l1", MemoryType.LOCAL ) )
-                    l1 = "" + m.<Integer>read( "l1", MemoryType.LOCAL );
-                if( m.isSomewhereDefined( "k0", MemoryType.LOCAL ) )
-                    k0 = "" + m.<Integer>read( "k0", MemoryType.LOCAL );
-                if( m.isSomewhereDefined( "k1", MemoryType.LOCAL ) )
-                    k1 = "" + m.<Integer>read( "k1", MemoryType.LOCAL );
-                if( m.isSomewhereDefined( "v", MemoryType.LOCAL ) && m.<LayeredGraphEdge>read( "v", MemoryType.LOCAL ).getSources().get( 0 ).getName() != null )
-                    v = "" + m.<LayeredGraphEdge>read( "v", MemoryType.LOCAL ).getSources().get( 0 ).getName();
-                if( m.isSomewhereDefined( "n", MemoryType.LOCAL ) && m.<LayeredGraphNode>read( "n", MemoryType.LOCAL ).getName() != null )
-                    n = "" + m.<LayeredGraphNode>read( "n", MemoryType.LOCAL ).getName();
-                info += "|" + TextLayoutHelper.strToLen( i, 4 ) + 
-                        "|" + TextLayoutHelper.strToLen( l, 4 ) + 
-                        "|" + TextLayoutHelper.strToLen( l1, 4 ) + 
-                        "|" + TextLayoutHelper.strToLen( k0, 4 ) + 
-                        "|" + TextLayoutHelper.strToLen( k1, 4 ) + 
-                        "|" + TextLayoutHelper.strToLen( v, 5 ) + 
-                        "|" + TextLayoutHelper.strToLen( n, 5 ) + "|\n";
+                String info = "| Node | Shift | Sink | Root | Align |  x  |  xDef  |\n";
+                info +=       "|------|-------|------|------|-------|-----|--------|\n";
+                LayeredGraphNode graph = m.read( "graph", MemoryType.LOCAL );
+                LayoutType layout = LayoutType.fromString( m.read( "layout", MemoryType.LOCAL ) );
+                for( LayeredGraphNode n : graph.getContainedNodes() )
+                {
+                    info += "|" + TextLayoutHelper.strToLen( n.getName(), 6 ) + 
+                            "|" + TextLayoutHelper.strToLen( n.getShift( layout ) + "", 7 ) + 
+                            "|" + TextLayoutHelper.strToLen( n.getSink( layout ).getName(), 6 ) + 
+                            "|" + TextLayoutHelper.strToLen( n.getRoot( layout ).getName(), 6 ) + 
+                            "|" + TextLayoutHelper.strToLen( n.getAlign( layout ).getName(), 7 ) + 
+                            "|" + TextLayoutHelper.strToLen( n.getX( layout ) + "", 5 ) + 
+                            "|" + TextLayoutHelper.strToLen( !n.isXUndefined( layout ) + "", 8 ) + "|\n";
+                }
                 return info;
             }
         };