commit

save_err1.graph

@@ -1,6 +1,7 @@
 {
 	"layers":[
 		[
+			{"name":"0"},
 			{"name":"1"},
 			{"name":"2"}
 		],
@@ -15,6 +16,7 @@
 		]
 	],
 	"edges":[
+		{"source":"0","target":"5"},
 		{"source":"1","target":"5"},
 		{"source":"2","target":"5"},
 		{"source":"3","target":"7"},

src/Algorithms/Animated/BK/Compaction.java

@@ -166,8 +166,8 @@ public class Compaction implements AlgorithmStage{
 					else 
 					{ // w = align[w]
 						LayeredGraphNode oldW = sf.w;
-						sf.v.setSelected( layout );
 						sf.w = sf.w.getAlignedTo( layout );
+						sf.w.setSelected( layout );
 						if( sf.w == sf.v ) // schleifenabbruchbedingung
 						{ //abbrechen, placeblock beendet
                             System.out.println( "return place_block( " + sf.v.getName() + " )" );

src/Algorithms/RandomGraphGenerator.java

@@ -52,6 +52,7 @@ public class RandomGraphGenerator {
             node = parent.createNode( null );
         if( ( Math.random() <= pSubgraph && depth < maxDepth ) || depth == 0 )
         {
+            int index = 0;
             int layer = (int)( Math.random() * ( maxLayer - minLayer ) ) + minLayer;
             for( int i = 0; i < layer; i++ )
             {
@@ -68,6 +69,8 @@ public class RandomGraphGenerator {
                                 node.createSimpleEdge( null, n2, n );
                         }
                     }
+                    n.setName( "" + (index+1) );
+                    index++;
                 }
             }
         }

src/Main.java

@@ -15,7 +15,7 @@ public class Main {
 	public static void main(String[] args) {
 		Reader r = new Reader( "save_err1.graph" );
 		LayeredGraphNode graph = r.readInputGraph();
-	    //RandomGraphGenerator r = new RandomGraphGenerator( 0.1, 0.2, 5,5, 5, 5, 2 );
+	    //RandomGraphGenerator r = new RandomGraphGenerator( 0.1, 0.2, 5,5, 5, 5, 1 );
 	    //LayeredGraphNode graph = r.createRandomNode( null, 0 );
 	    //SweepCrossingMinimizer cminzer = new SweepCrossingMinimizer();
 	    //for( int i = 0; i < 10; i++ )