Merge branch 'master' into vincenzo

Author: VincenzoArceri

automata/automaton0005

@@ -0,0 +1,11 @@
+q0 q1 q2 q3 q4 q5 q6 q7 q8
+q0
+q8
+q0 q1 '
+q1 q2 y
+q2 q3 :
+q3 q4 =
+q4 q5 1
+q5 q6 ;
+q6 q7 $
+q7 q8 '

src/it/univr/fsm/machine/Automaton.java

@@ -1241,10 +1241,11 @@ public void hopcroftremoveUnreachableStates(){
 		HashSet<State> newStates = (HashSet<State>) this.getInitialStates().clone();
 		HashSet<Transition> transitionstoRemove = new HashSet<>(); 
 		HashSet<State> temp;
+		final HashSet<State> emptySet = new HashSet<>(Collections.<State>emptySet());
 
 
 		do{
-			temp = new HashSet<>(Collections.<State>emptySet());
+			temp = (HashSet<State>) emptySet.clone();
 			for(State s : newStates){
 				for(String a : getAlphabet(this)){
 					State to = getOutgoingStatefromTransitionSymbol(s, a);
@@ -1346,20 +1347,18 @@ public void hopcroftMinimize(){
 
 		HashSet<State> A = new HashSet<>();
 		HashSet<State> X;
-		LinkedList<HashSet<State>> listYs;
-		Random r=new Random();
+		List<HashSet<State>> listYs;
+		Random r = new Random();
 
 		while(!W.isEmpty()){
 			//choose and remove a set A from W
-			do{
-				for(HashSet<State> s : W){
-					int insert=r.nextInt(2);
-					if(insert > 0)
-						A = s;
-					else break;
-				}
-				W.remove(A);
-			}while(A.isEmpty());
+
+			for(HashSet<State> s : W){
+				A = s;
+				if(r.nextInt(2) == 0)
+					break;
+			}
+			W.remove(A);
 
 			for(String c : getAlphabet(this)){
 				// select a X set for which a transition in c leads to a state in A
@@ -1414,7 +1413,6 @@ private void constructMinimumAutomatonFromPartition(HashSet<HashSet<State>> P) {
 				isInitialState = isInitialState || s.isInitialState();
 				isFinalState = isFinalState || s.isFinalState();
 
-				
 			}
 
 			State mergedMacroState = new State(macroStatename, isInitialState, isFinalState);
@@ -1440,7 +1438,9 @@ private void constructMinimumAutomatonFromPartition(HashSet<HashSet<State>> P) {
 		this.states = new HashSet<State>(automatonStateBinding.values());
 		this.delta = newDelta;
 
-		this.adjacencyList = this.computeAdjacencyList();
+		for(State s : states){
+			updateAdjacencyList(s);
+		}
 	}
 
 	/**

src/it/univr/fsm/main/Main.java

@@ -69,8 +69,8 @@ public static void main(String[] args) {
 		System.out.println("a:");
 		System.out.println(a);
 		a.hopcroftMinimize();
-		System.out.println(a);
-		*/
+		System.out.println(a);*/
+		
 
 		Automaton a3 = Automaton.loadAutomata("/Users/andreaperazzoli/Desktop/SPY/java-fsm-library/automata/" + "automaton0003");
 		System.out.println("a3:");