changed from using copy-constructor to using a method, to allow copyi…

…ng any kind of rule

src/main/java/net/zomis/minesweeper/analyze/AnalyzeFactory.java

@@ -37,12 +37,12 @@ public AnalyzeFactory() {
 	public AnalyzeResult<T> solve() {
 		List<FieldRule<T>> original = new ArrayList<FieldRule<T>>(this.rules.size());
 		for (FieldRule<T> rule : this.rules) {
-			original.add(new FieldRule<T>(rule));
+			original.add(rule.copy());
 		}
 
 		List<FieldRule<T>> inProgress = new ArrayList<FieldRule<T>>(this.rules.size());
 		for (FieldRule<T> rule : this.rules) {
-			inProgress.add(new FieldRule<T>(rule));
+			inProgress.add(rule.copy());
 		}
 
 		final List<Solution<T>> solutions = new ArrayList<Solution<T>>();

src/main/java/net/zomis/minesweeper/analyze/AnalyzeResultsImpl.java

@@ -91,7 +91,7 @@ private AnalyzeFactory<T> solutionToNewAnalyze(Solution<T> solution, List<FieldR
 		List<FieldRule<T>> newRules = new ArrayList<FieldRule<T>>();
 		for (FieldRule<T> rule : extraRules) { 
 			// Create new rules, because the older ones may have been simplified already.
-			newRules.add(new FieldRule<T>(rule));
+			newRules.add(rule.copy());
 		}
 		AnalyzeFactory<T> newRoot = new AnalyzeFactory<T>(solution, newRules);
 		return newRoot;
@@ -103,7 +103,7 @@ public AnalyzeResult<T> cloneAddSolve(List<FieldRule<T>> extraRules) {
 		newRules.addAll(extraRules);
 		AnalyzeFactory<T> copy = new AnalyzeFactory<T>();
 		for (FieldRule<T> rule : newRules) {
-			copy.addRule(new FieldRule<T>(rule));
+			copy.addRule(rule.copy());
 		}
 		return copy.solve();
 	}

src/main/java/net/zomis/minesweeper/analyze/BoundedFieldRule.java

@@ -19,8 +19,10 @@ public class BoundedFieldRule<T> extends FieldRule<T> {
 	 * 
 	 * @param copyFrom Rule to copy
 	 */
-	public BoundedFieldRule(BoundedFieldRule<T> copyFrom) {
-		super(copyFrom);
+	private BoundedFieldRule(BoundedFieldRule<T> copyFrom) {
+		super(copyFrom.getCause(), copyFrom.fields);
+		this.minResult = copyFrom.minResult;
+		this.maxResult = copyFrom.maxResult;
 	}
 
 	/**
@@ -122,4 +124,9 @@ public String toString() {
 		rule.append(maxResult);
 		return rule.toString(); 
 	}
+
+	@Override
+	public FieldRule<T> copy() {
+		return new BoundedFieldRule<T>(this);
+	}
 }

src/main/java/net/zomis/minesweeper/analyze/FieldRule.java

@@ -11,7 +11,7 @@
  * @author Simon Forsberg
  * @param <T> Field type
  */
-public class FieldRule<T> {
+public class FieldRule<T> implements RuleConstraint<T> {
 
 	private final T cause;
 	protected final List<FieldGroup<T>> fields;
@@ -22,12 +22,17 @@ public class FieldRule<T> {
 	 * 
 	 * @param copyFrom Rule to copy
 	 */
-	public FieldRule(FieldRule<T> copyFrom) {
+	private FieldRule(FieldRule<T> copyFrom) {
 		this.fields = new ArrayList<FieldGroup<T>>(copyFrom.fields); // Deep copy? Probably not. FieldGroup don't change much.
 		this.result = copyFrom.result;
 		this.cause = copyFrom.cause;
 	}
 
+	protected FieldRule(T cause, List<FieldGroup<T>> fields) {
+		this.cause = cause;
+		this.fields = new ArrayList<FieldGroup<T>>(fields);
+	}
+
 	/**
 	 * Create a rule from a list of fields and a result (create a new FieldGroup for it)
 	 * 
@@ -121,7 +126,7 @@ public FieldGroup<T> getSmallestFieldGroup() {
 		return result;
 	}
 
-	public boolean isEmpty () {
+	public boolean isEmpty() {
 		return fields.isEmpty() && result == 0;
 	}
 
@@ -131,6 +136,7 @@ public double nCr() {
 		return Combinatorics.nCr(this.getFieldsCountInGroups(), this.result);
 	}
 
+	@Override
 	public SimplifyResult simplify(GroupValues<T> knownValues) {
 		if (this.isEmpty()) {
 			return SimplifyResult.NO_EFFECT;
@@ -199,4 +205,9 @@ public String toString() {
 		rule.append(result);
 		return rule.toString(); 
 	}
+
+	@Override
+	public FieldRule<T> copy() {
+		return new FieldRule<T>(this);
+	}
 }

src/main/java/net/zomis/minesweeper/analyze/GameAnalyze.java

@@ -82,7 +82,7 @@ private double solveRules(List<Solution<T>> solutions) {
 
 			List<FieldRule<T>> rulesCopy = new ArrayList<FieldRule<T>>(); // deep copy!
 			for (FieldRule<T> rule : this.rules) {
-				rulesCopy.add(new FieldRule<T>(rule));
+				rulesCopy.add(rule.copy());
 			}
 
 			total += new GameAnalyze<T>(mapCopy, rulesCopy, this.callback).solve(solutions);

src/main/java/net/zomis/minesweeper/analyze/RuleConstraint.java

@@ -0,0 +1,8 @@
+package net.zomis.minesweeper.analyze;
+
+public interface RuleConstraint<T> {
+
+	SimplifyResult simplify(GroupValues<T> knownValues);
+
+	FieldRule<T> copy();
+}