internalize utility function disjoint(), i.e. make it a method

1 files changed, 4 insertions, 10 deletions

diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Graph.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Graph.java
index a7689f8..f24264c 100644
--- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Graph.java
+++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Graph.java
@@ -120,11 +120,8 @@ public final class Graph extends Storage {
 
 	/// sets of disjoint choices
 	///
-	/// @param g  Graph to inspect
 	/// @return   list of disjoint sets
-	public static ArrayList<Set<Vertex>> disjoint(
-		final AbstractGraph g
-	) {
+	public ArrayList<Set<Vertex>> disjoint() {
 
 		// get all subject modules
 		//
@@ -132,17 +129,14 @@ public final class Graph extends Storage {
 		List<Vertex> modules = new ArrayList<>(g.vertices());
 		Collections.shuffle(modules);
 
-		return disjoint(g, modules);
+		return disjoint(modules);
 	}
 
 	/// groups of disjoint choices seeded by priority list of choices
 	///
-	/// @param g    Graph to inspect
 	/// @param vip  Ordered list of subject modules to prioritize
 	/// @return     List of sets of disjoint choices
-	public static ArrayList<Set<Vertex>> disjoint(
-		final AbstractGraph g, final List<Vertex> vip
-	) {
+	public ArrayList<Set<Vertex>> disjoint(final List<Vertex> vip) {
 		ArrayList<Set<Vertex>> sets = new ArrayList<>();
 
 		// track done subject modules as extendable set
@@ -299,7 +293,7 @@ public final class Graph extends Storage {
 			  + " (otherwise an exception was thrown)");
 
 		// collect disjoint choice sets
-		ArrayList<Set<Vertex>> s = disjoint(g);
+		ArrayList<Set<Vertex>> s = disjoint();
 		System.out.printf(
 			"\n\n%d disjoint choice sets collected:\n",
 			s.size());