added groupvalues parameter to isEmpty method

Zomis · Jan 3, 2015 · 84c5ed7 · 84c5ed7
1 parent 02e49e1
commit 84c5ed7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/net/zomis/minesweeper/analyze/BoundedFieldRule.java b/src/main/java/net/zomis/minesweeper/analyze/BoundedFieldRule.java
@@ -50,13 +50,13 @@ public double nCr() {
 	}
 
 	@Override
-	public boolean isEmpty() {
+	public boolean isEmpty(GroupValues<T> knownValues) {
 		return fields.isEmpty() && minResult >= 0;
 	}
 
 	@Override
 	public SimplifyResult simplify(GroupValues<T> knownValues) {
-		if (this.isEmpty()) {
+		if (this.isEmpty(knownValues)) {
 			return SimplifyResult.NO_EFFECT;
 		}
 

diff --git a/src/main/java/net/zomis/minesweeper/analyze/FieldRule.java b/src/main/java/net/zomis/minesweeper/analyze/FieldRule.java
@@ -126,7 +126,7 @@ public FieldGroup<T> getSmallestFieldGroup() {
 		return result;
 	}
 
-	public boolean isEmpty() {
+	public boolean isEmpty(GroupValues<T> knownValues) {
 		return fields.isEmpty() && result == 0;
 	}
 
@@ -138,7 +138,7 @@ public double nCr() {
 
 	@Override
 	public SimplifyResult simplify(GroupValues<T> knownValues) {
-		if (this.isEmpty()) {
+		if (this.isEmpty(knownValues)) {
 			return SimplifyResult.NO_EFFECT;
 		}
 

diff --git a/src/main/java/net/zomis/minesweeper/analyze/GameAnalyze.java b/src/main/java/net/zomis/minesweeper/analyze/GameAnalyze.java
@@ -20,7 +20,7 @@ public class GameAnalyze<T> {
 	private void removeEmptyRules() {
 		Iterator<FieldRule<T>> it = rules.iterator();
 		while (it.hasNext()) {
-			if (it.next().isEmpty())
+			if (it.next().isEmpty(knownValues))
 				it.remove();
 		}
 	}