Reimplemented AI (old one was too slow)

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@443 72836036-5685-4462-b002-a69064685172

1 files changed, 0 insertions, 90 deletions

diff --git a/src/jrummikub/ai/fdsolver/constraint/OffsetConstraint.java b/src/jrummikub/ai/fdsolver/constraint/OffsetConstraint.java
deleted file mode 100644
index eb72df8..0000000
--- a/src/jrummikub/ai/fdsolver/constraint/OffsetConstraint.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package jrummikub.ai.fdsolver.constraint;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import jrummikub.ai.fdsolver.Constraint;
-import jrummikub.ai.fdsolver.Propagator;
-import jrummikub.ai.fdsolver.Satisfiability;
-import jrummikub.ai.fdsolver.Var;
-
-public class OffsetConstraint extends Constraint {
-	private Var<Integer> x, y;
-	int offset;
-	Propagator propX, propY;
-
-	public OffsetConstraint(int offset, Var<Integer> x, Var<Integer> y) {
-		this.offset = offset;
-		this.x = x;
-		this.y = y;
-		propX = new OffsetProp(offset, x, y);
-		propY = new OffsetProp(-offset, y, x);
-	}
-
-	@Override
-	public Collection<Var<?>> getWatchedVars() {
-		return Arrays.<Var<?>> asList(x, y);
-	}
-	
-	private class OffsetProp implements Propagator {
-		private Var<Integer> x, y;
-		private int offset;
-		public OffsetProp(int offset, Var<Integer> x, Var<Integer> y) {
-			this.offset = offset;
-			this.x = x;
-			this.y = y;
-		}
-		
-		@Override
-		public Collection<Var<?>> getWatchedVars() {
-			return Arrays.<Var<?>>asList(y);
-		}
-
-		@Override
-		public void propagate() {
-			for(Iterator<Integer> i = x.iterator(); i.hasNext();) {
-				if(!y.getRange().contains(i.next() + offset)) {
-					i.remove();
-				}
-			}
-		}
-	}
-	
-
-	@Override
-	public Collection<Propagator> getPropagators(boolean negate) {
-		return Arrays.asList(propX, propY);
-	}
-
-	@Override
-	public Satisfiability getSatisfiability() {
-		boolean disjoint = true;
-		if (x.getRange().size() < y.getRange().size()) {
-			for (int xv : x.getRange()) {
-				if (y.getRange().contains(xv + offset)) {
-					disjoint = false;
-					break;
-				}
-			}
-		} else {
-			for (int yv : y.getRange()) {
-				if (x.getRange().contains(yv - offset)) {
-					disjoint = false;
-					break;
-				}
-			}
-		}
-		
-		if (disjoint) {
-			return Satisfiability.UNSAT;
-		} else if (x.getRange().size() == 1 && y.getRange().size() == 1) {
-			return Satisfiability.TAUT;
-		} else {
-			return Satisfiability.SAT;
-		}
-	}
-
-}