changed how smallest field group is selected

Zomis · Jan 3, 2015 · 577efca · 577efca
1 parent 77de281
commit 577efca
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/net/zomis/minesweeper/analyze/GameAnalyze.java b/src/main/java/net/zomis/minesweeper/analyze/GameAnalyze.java
@@ -66,7 +66,7 @@ private double solveRules(List<Solution<T>> solutions) {
 		if (this.rules.isEmpty())
 			return 0;
 
-		FieldGroup<T> chosenGroup = this.rules.get(0).getSmallestFieldGroup();
+		FieldGroup<T> chosenGroup = getSmallestFieldGroup();
 		if (chosenGroup == null) {
 			throw new IllegalStateException("Chosen group is null.");
 		}
@@ -89,5 +89,15 @@ private double solveRules(List<Solution<T>> solutions) {
 		}
 		return total;
 	}
+
+	private FieldGroup<T> getSmallestFieldGroup() {
+		for (FieldRule<T> rule : rules) {
+			FieldGroup<T> smallest = rule.getSmallestFieldGroup();
+			if (smallest != null) {
+				return smallest;
+			}
+		}
+		return null;
+	}
 
 }