improved isEmpty functionality of a UniqueSequence

Zomis · Jan 4, 2015 · 648e146 · 648e146
1 parent 577efca
commit 648e146
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/test/java/net/zomis/minesweeper/analyze/bounded/UniqueSequence.java b/src/test/java/net/zomis/minesweeper/analyze/bounded/UniqueSequence.java
@@ -23,15 +23,7 @@ public UniqueSequence(T cause, List<List<T>> fields) {
 
 	@Override
 	public boolean isEmpty(GroupValues<T> knownValues) {
-		for (List<T> i : list) {
-			for (T t : i) {
-				Integer value = getSetValue(t, knownValues);
-				if (value == null) {
-					return false;
-				}
-			}
-		}
-		return true;
+		return list.isEmpty();
 	}
 
 	@Override
@@ -50,6 +42,16 @@ public SimplifyResult simplify(GroupValues<T> knownValues) {
 			}
 		}
 
+		for (List<T> i : list) {
+			for (T t : i) {
+				Integer value = getSetValue(t, knownValues);
+				if (value == null) {
+					return SimplifyResult.NO_EFFECT;
+				}
+			}
+		}
+
+		list.clear();
 		return SimplifyResult.NO_EFFECT;
 	}