Merge remote-tracking branch 'origin/master'

src/graph/LayeredNode.java

@@ -23,29 +23,29 @@ public class LayeredNode implements LayeredGraphNode {
     private boolean dummy;
 
     private class LayoutInfo {
-        public double x;
-        public double y;
-        public double w;
-        public double h;
-        public Color color;
-        public boolean selected;
-        public boolean xUndef;
+    	private double x;
+        private double y;
+        private double w;
+        private double h;
+        private Color color;
+        private boolean selected;
+        private boolean xUndef;
 
         // Block Calculation
-        public LayeredGraphNode align;
-        public LayeredGraphNode root;
+        private LayeredGraphNode align;
+        private LayeredGraphNode root;
         // HorizontalCompaction
-        public LayeredGraphNode sink;
-        public double shift;
+        private LayeredGraphNode sink;
+        private double shift;
         private NodeView view;
     }
 
     private class CombinedLayoutInfo {
-        public double x;
-        public double y;
-        public double w;
-        public double h;
-        public boolean selected;
+    	private double x;
+    	private double y;
+    	private double w;
+    	private double h;
+    	private boolean selected;
         private NodeView view;
     }
 

src/test/RandomProcessor.java

@@ -49,7 +49,7 @@ public class RandomProcessor extends PseudoCodeProcessor {
                 System.out.println( actions + " Actions done.");
                 if( !controlStack.isEmpty() )
                     throw new IllegalStateException( "There are too manny Objects in the control Stack." );
-                System.out.println( "Random Iteration " + i + " finisted successfully." );
+                System.out.println( "Random Iteration " + i + " finished successfully." );
             }
         } catch (Exception e) {
             e.printStackTrace();

src/test/TestProcessor.java

@@ -5,17 +5,28 @@ import javax.swing.JTree;
 
 import bk.BKNodePlacement;
 import graph.LayeredGraphNode;
+import graph.RandomGraphGenerator;
 import graph.io.Reader;
 import lib.SimpleNodePlacement;
+import lib.SweepCrossingMinimizer;
 import processor.PseudoCodeNode;
 import processor.PseudoCodeProcessor;
 
+@SuppressWarnings("unused")
 class TestProcessor {
     
     public static void main(String[] args) throws InterruptedException {
-        Reader r = new Reader( "papergraph.json" );
-        LayeredGraphNode graph = r.readInputGraph();
+    	
+    	RandomGraphGenerator r = new RandomGraphGenerator( 0.2, 0.8, 3, 15, 2, 15, 3 );
+        LayeredGraphNode graph = r.createRandomNode( null, 0, true );
+        SweepCrossingMinimizer cminzer = new SweepCrossingMinimizer();
+        for( int i = 0; i < 10; i++ )
+          cminzer.minimizeCrossings( graph );
         SimpleNodePlacement.placeNodes( graph );
+    
+        //Reader r = new Reader( "papergraph.json" );
+        //LayeredGraphNode graph = r.readInputGraph();
+        //SimpleNodePlacement.placeNodes( graph );
 
         BKNodePlacement algorithm = new BKNodePlacement();
         JTree pseudoTree = new JTree();