diff --git a/graphminimize/build.gradle b/graphminimize/build.gradle index d3fbb01b4e85637da4fbafee6fa08b8e3790c62e..6cd0fbcbd3833a012ac40006eca20439245e15d7 100644 --- a/graphminimize/build.gradle +++ b/graphminimize/build.gradle @@ -22,7 +22,7 @@ sourceSets { dependencies { compile name: 'gs-core-1.3' compile name: 'gs-ui-1.3' - compileOnly name: 'commons-io-2.5' + compile name: 'commons-io-2.5' compileOnly name: 'commons-codec-1.10' compileOnly name: 'jsoup-1.8.1' } diff --git a/graphshow/build.gradle b/graphshow/build.gradle index 337c5c7822e2507d6bb501bd16f5178f05e9245f..232c61415a0af7951aff0e64737059e0602894e3 100644 --- a/graphshow/build.gradle +++ b/graphshow/build.gradle @@ -17,7 +17,7 @@ sourceSets { dependencies { compile name: 'gs-core-1.3' compile name: 'gs-ui-1.3' - compileOnly name: 'commons-io-2.5' + compile name: 'commons-io-2.5' compileOnly name: 'commons-codec-1.10' compileOnly name: 'jsoup-1.8.1' } diff --git a/graphshow/src/main/java/GraphShow.java b/graphshow/src/main/java/GraphShow.java index 96c83a93086ea04951bbdf5c90a8510260374ddd..a8333f593b9a5268c6f7f99a978ab0adfb279632 100755 --- a/graphshow/src/main/java/GraphShow.java +++ b/graphshow/src/main/java/GraphShow.java @@ -135,7 +135,7 @@ public class GraphShow { AUTGraph graph = new AUTGraph(); graph.buildGraph(graphData); - System.out.println("Graph has " + graph.getNbOfStates() + " and " + graph.getNbOfTransitions() + " transitions."); + System.out.println("Graph has " + graph.getNbOfStates() + " states and " + graph.getNbOfTransitions() + " transitions."); graph.display(true); diff --git a/src/main/java/graph/AUTGraph.java b/src/main/java/graph/AUTGraph.java index 5fd940e2348b2ca75c78ad619203c3b1c8019659..949ecb03ab73df7d4b34663928b0fcaef0aa6c6d 100755 --- a/src/main/java/graph/AUTGraph.java +++ b/src/main/java/graph/AUTGraph.java @@ -1155,7 +1155,7 @@ public class AUTGraph implements myutil.Graph { X_X1_X2.addBlock(blockX); X_X1_X2.addBlock(blockX1); X_X1_X2.addBlock(blockX2); - TraceManager.addDev("Test concat X1+X2=" + AUTBlock.concat(blockX1, blockX2)); + //TraceManager.addDev("Test concat X1+X2=" + AUTBlock.concat(blockX1, blockX2)); w.addPartition(X_X1_X2); TraceManager.addDev("Modifying P and W:"); printConfiguration(partition, w); @@ -1171,7 +1171,7 @@ public class AUTGraph implements myutil.Graph { // Compound splitter else if (currentP.blocks.size() == 3) { - //TraceManager.addDev("Complexe splitter (b, bi, bii) =" + currentP); + TraceManager.addDev("Complex splitter (b, bi, bii) =" + currentP); AUTBlock b = currentP.blocks.get(0); AUTBlock bi = currentP.blocks.get(1); AUTBlock bii = currentP.blocks.get(2); @@ -1181,7 +1181,7 @@ public class AUTGraph implements myutil.Graph { bii = currentP.blocks.get(1); } - //TraceManager.addDev("B= " + b + " bi=" + bi + " bii=" + bii); + TraceManager.addDev("B= " + b + " bi=" + bi + " bii=" + bii); for (AUTElement elt : sortedAlphabet) { //TraceManager.addDev("\n*** Considering alphabet element = " + elt.value); @@ -1214,13 +1214,13 @@ public class AUTGraph implements myutil.Graph { blockX3.addState(st); } } - //TraceManager.addDev("Block X = " + blockX + " Block1,2,3 computed\n\tX1 = " + blockX1 + "\n\tX2 = " + blockX2 + "\n\tX3 = " + blockX3); + TraceManager.addDev("Block X = " + blockX + " Block1,2,3 computed\n\tX1 = " + blockX1 + "\n\tX2 = " + blockX2 + "\n\tX3 = " + blockX3); if ((blockX.compareTo(blockX1) == 0) || (blockX.compareTo(blockX2) == 0) || (blockX.compareTo(blockX2) == 0)) { // do nothing - //TraceManager.addDev("Identical blocks! X"); + TraceManager.addDev("Identical blocks! X"); } else { - //TraceManager.addDev("Non Identical blocks! X"); + TraceManager.addDev("Non Identical blocks! X"); // Modifying partition partition.removeBlock(blockX); partition.addIfNonEmpty(blockX1); @@ -1272,7 +1272,7 @@ public class AUTGraph implements myutil.Graph { } TraceManager.addDev("\nAll done: it: " + maxIte + "\n---------"); - //printConfiguration(partition, w); + printConfiguration(partition, w); //TraceManager.addDev("------------------"); // Generating new graph