Explicit SCC computation returns BitSets.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5363 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/src/explicit/SCCComputer.java

@@ -27,6 +27,7 @@
 
 package explicit;
 
+import java.util.BitSet;
 import java.util.List;
 
 /**
@@ -56,7 +57,7 @@ public abstract class SCCComputer
 	{
 		return new SCCComputerTarjan(model);
 	}
-	
+
 	/**
 	 * Compute SCCs and store them. They can be retrieved using {@link #getSCCs()}.
 	 */
@@ -70,10 +71,10 @@ public abstract class SCCComputer
 	/**
 	 * Get the list of computed SCCs.
 	 */
-	public abstract List<List<Integer>> getSCCs();
+	public abstract List<BitSet> getSCCs();
 
 	/**
 	 * Get the list of computed BSCCs.
 	 */
-	public abstract List<List<Integer>> getBSCCs();
+	public abstract List<BitSet> getBSCCs();
 }

prism/src/explicit/SCCComputerTarjan.java

@@ -28,6 +28,7 @@
 package explicit;
 
 import java.util.ArrayList;
+import java.util.BitSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -42,7 +43,7 @@ public class SCCComputerTarjan extends SCCComputer
 	/* Number of nodes (model states) */
 	private int numNodes;
 	/* Computed list of SCCs */
-	private List<List<Integer>> sccs = new ArrayList<List<Integer>>();
+	private List<BitSet> sccs = new ArrayList<BitSet>();
 
 	/* Next index to give to a node */
 	private int index = 0;
@@ -50,8 +51,8 @@ public class SCCComputerTarjan extends SCCComputer
 	private List<Integer> stack = new LinkedList<Integer>();
 	/* List of nodes in the graph. Invariant: {@code nodeList.get(i).id == i} */
 	private ArrayList<Node> nodeList;
-	/* True iff node {@code i} currently is on the stack. */
-	boolean[] onStack;
+	/* Nodes currently on the stack. */
+	private BitSet onStack;
 
 	/**
 	 * Build (B)SCC computer for a given model.
@@ -64,7 +65,7 @@ public class SCCComputerTarjan extends SCCComputer
 		for (int i = 0; i < numNodes; i++) {
 			nodeList.add(new Node(i));
 		}
-		onStack = new boolean[numNodes];
+		onStack = new BitSet();
 	}
 
 	// Methods for SCCComputer interface
@@ -82,13 +83,13 @@ public class SCCComputerTarjan extends SCCComputer
 	}
 
 	@Override
-	public List<List<Integer>> getSCCs()
+	public List<BitSet> getSCCs()
 	{
 		return sccs;
 	}
 
 	@Override
-	public List<List<Integer>> getBSCCs()
+	public List<BitSet> getBSCCs()
 	{
 		return null;
 	}
@@ -108,32 +109,32 @@ public class SCCComputerTarjan extends SCCComputer
 
 	}
 
-	private void tarjan(Integer i)
+	private void tarjan(int i)
 	{
 		final Node v = nodeList.get(i);
 		v.index = index;
 		v.lowlink = index;
 		index++;
 		stack.add(0, i);
-		onStack[i] = true;
+		onStack.set(i);
 		Iterator<Integer> it = model.getSuccessorsIterator(i);
 		while (it.hasNext()) {
-			Integer e = it.next();
+			int e = it.next();
 			Node n = nodeList.get(e);
 			if (n.index == -1) {
 				tarjan(e);
 				v.lowlink = Math.min(v.lowlink, n.lowlink);
-			} else if (onStack[e]) {
+			} else if (onStack.get(e)) {
 				v.lowlink = Math.min(v.lowlink, n.index);
 			}
 		}
 		if (v.lowlink == v.index) {
-			Integer n;
-			List<Integer> component = new ArrayList<Integer>();
+			int n;
+			BitSet component = new BitSet();
 			do {
 				n = stack.remove(0);
-				onStack[n] = false;
-				component.add(n);
+				onStack.set(n, false);
+				component.set(n);
 			} while (n != i);
 			sccs.add(component);
 		}