neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Several speed optimizations

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@438 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Jannis Harder 2011-06-14 17:48:26 +02:00
parent 0a63df955e
commit 99c3d48f10
9 changed files with 130 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/jrummikub/ai/TurnLogic.java
View file

@ -1,5 +1,15 @@
package jrummikub.ai;
import static jrummikub.ai.fdsolver.Constraints.constant;
import static jrummikub.ai.fdsolver.Constraints.index;
import static jrummikub.ai.fdsolver.Constraints.lessThan;
import static jrummikub.ai.fdsolver.Constraints.lessThanEq;
import static jrummikub.ai.fdsolver.Constraints.offset;
import static jrummikub.ai.fdsolver.Constraints.same;
import static jrummikub.ai.fdsolver.Constraints.sum;
import static jrummikub.ai.fdsolver.Constraints.unless;
import static jrummikub.ai.fdsolver.Constraints.when;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@ -9,13 +19,9 @@ import java.util.Set;
import jrummikub.ai.fdsolver.Constraint;
import jrummikub.ai.fdsolver.Solver;
import jrummikub.ai.fdsolver.Var;
import jrummikub.ai.fdsolver.constraint.IfConstraint;
import jrummikub.ai.fdsolver.constraint.IndexConstraint;
import jrummikub.ai.fdsolver.constraint.LessThan;
import jrummikub.model.GameSettings;
import jrummikub.model.Stone;
import jrummikub.model.StoneColor;
import static jrummikub.ai.fdsolver.Constraints.*;
/**
* Provides Humanlike Advanced Logic (HAL) that models the options given to a

4
src/jrummikub/ai/fdsolver/Constraint.java
View file

@ -10,4 +10,8 @@ public abstract class Constraint {
public abstract Collection<Propagator> getPropagators(boolean negate);
public abstract Satisfiability getSatisfiability();
public boolean isSatisfiable() {
return getSatisfiability() != Satisfiability.UNSAT;
}
}

51
src/jrummikub/ai/fdsolver/Solver.java
View file

@ -7,6 +7,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import static jrummikub.ai.fdsolver.Satisfiability.*;
@ -24,6 +25,8 @@ public class Solver {
Set<Constraint> constraints = new HashSet<Constraint>();
Set<Constraint> dirtyConstraints = new HashSet<Constraint>();
ArrayList<StackFrame> stack = new ArrayList<StackFrame>();
boolean contradiction = false;
@ -83,22 +86,13 @@ public class Solver {
}
}
public void propagateOnce() {
Var<?> dirtyVar = Collections.min(dirtyVars);
dirtyVars.remove(dirtyVar);
outerLoop: for (Iterator<Constraint> i = dirtyVar.getConstraints()
.iterator(); i.hasNext();) {
Constraint constraint = i.next();
Satisfiability sat = constraint.getSatisfiability();
if (sat == UNSAT) {
contradiction = true;
break;
}
if (sat == TAUT) {
i.remove();
finishedConstraint(constraint, dirtyVar);
continue;
}
public void propagateEach() {
List<Var<?>> oldDirtyVars = new ArrayList<Var<?>>(dirtyVars);
dirtyVars.clear();
Collections.sort(oldDirtyVars);
outerLoop: for(Var<?> dirtyVar : oldDirtyVars) {
for (Constraint constraint : dirtyVar.getConstraints()) {
dirtyConstraints.add(constraint);
for (Propagator propagator : constraint.cachedPropagators) {
if (propagator.getWatchedVars().contains(dirtyVar)) {
propagator.propagate();
@ -109,12 +103,35 @@ public class Solver {
}
}
}
}
public void propagateAll() {
int i = 0;
while (!(dirtyVars.isEmpty() || contradiction)) {
propagateOnce();
i++;
if (i == 50) {
cleanUpConstraints();
i = 0;
} else {
propagateEach();
}
}
cleanUpConstraints();
}
private void cleanUpConstraints() {
for (Constraint constraint : dirtyConstraints) {
Satisfiability sat = constraint.getSatisfiability();
if (sat == UNSAT) {
contradiction = true;
break;
}
if (sat == TAUT) {
finishedConstraint(constraint, null);
}
}
dirtyConstraints.clear();
}
public void addVar(Var<?> var) {
vars.add(var);

8
src/jrummikub/ai/fdsolver/Var.java
View file

@ -99,18 +99,12 @@ public class Var<T> implements Comparable<Var<T>> {
return constraints.size();
}
private double fitness() {
return range.size();//neighborCount();
}
@Override
public int compareTo(Var<T> other) {
return ((Double)fitness()).compareTo(other.fitness());
/*
int rangeCompare = ((Integer)range.size()).compareTo(other.range.size());
if (rangeCompare != 0)
return rangeCompare;
return -((Integer)neighborCount()).compareTo(other.neighborCount());*/
return -((Integer)neighborCount()).compareTo(other.neighborCount());
}
}

11
src/jrummikub/ai/fdsolver/constraint/ComparatorConstraint.java
View file

@ -6,6 +6,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.NoSuchElementException;
import jrummikub.ai.fdsolver.Constraint;
import jrummikub.ai.fdsolver.Propagator;
@ -18,7 +19,8 @@ public class ComparatorConstraint<T> extends Constraint {
ComparatorPropagator<T> trueX, trueY, falseX, falseY;
boolean allowEqual;
ComparatorConstraint(final Comparator<T> comparator, boolean allowEqual, Var<T> x, Var<T> y) {
ComparatorConstraint(final Comparator<T> comparator, boolean allowEqual,
Var<T> x, Var<T> y) {
this.x = x;
this.y = y;
this.comparator = comparator;
@ -31,7 +33,8 @@ public class ComparatorConstraint<T> extends Constraint {
};
trueX = new ComparatorPropagator<T>(comparator, allowEqual, x, y);
trueY = new ComparatorPropagator<T>(reverseComparator, allowEqual, y, x);
falseX = new ComparatorPropagator<T>(reverseComparator, !allowEqual, x, y);
falseX = new ComparatorPropagator<T>(reverseComparator, !allowEqual, x,
y);
falseY = new ComparatorPropagator<T>(comparator, !allowEqual, y, x);
}
@ -51,6 +54,7 @@ public class ComparatorConstraint<T> extends Constraint {
@Override
public Satisfiability getSatisfiability() {
try {
T maxX = Collections.max(x.getRange(), comparator);
T minY = Collections.min(y.getRange(), comparator);
if (comparator.compare(maxX, minY) < (allowEqual ? 1 : 0)) {
@ -62,6 +66,9 @@ public class ComparatorConstraint<T> extends Constraint {
return UNSAT;
}
return SAT;
} catch (NoSuchElementException e) {
return UNSAT;
}
}
}

2
src/jrummikub/ai/fdsolver/constraint/IfConstraint.java
View file

@ -63,7 +63,7 @@ public class IfConstraint extends Constraint {
@Override
public void propagate() {
if (child.getSatisfiability() == Satisfiability.UNSAT) {
if (!child.isSatisfiable()) {
condition.invalidate(!negateCond);
}
}

52
src/jrummikub/ai/fdsolver/constraint/IndexConstraint.java
View file

@ -8,6 +8,8 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import org.w3c.dom.ranges.Range;
import jrummikub.ai.fdsolver.Constraint;
import jrummikub.ai.fdsolver.Propagator;
import jrummikub.ai.fdsolver.Satisfiability;
@ -47,15 +49,15 @@ public class IndexConstraint<T> extends Constraint {
@Override
public void propagate() {
HashSet<T> union = new HashSet<T>();
HashSet<T> invUnion = new HashSet<T>(target.getRange());
for (int i : index.getRange()) {
union.addAll(list.get(i).getRange());
invUnion.removeAll(list.get(i).getRange());
if (invUnion.isEmpty()) {
return;
}
for (Iterator<T> i = target.iterator(); i.hasNext();) {
T val = i.next();
if (!union.contains(val)) {
i.remove();
}
for (T val : invUnion) {
target.invalidate(val);
}
};
}
@ -70,9 +72,8 @@ public class IndexConstraint<T> extends Constraint {
public void propagate() {
for (Iterator<Integer> i = index.iterator(); i.hasNext();) {
int id = i.next();
HashSet<T> range = new HashSet<T>(target.getRange());
range.retainAll(list.get(id).getRange());
if (range.isEmpty()) {
Var<T> item = list.get(id);
if (Collections.disjoint(item.getRange(), target.getRange())) {
i.remove();
}
}
@ -109,26 +110,31 @@ public class IndexConstraint<T> extends Constraint {
}
@Override
public Satisfiability getSatisfiability() {
HashSet<T> union = new HashSet<T>();
public boolean isSatisfiable() {
for (int i : index.getRange()) {
union.addAll(list.get(i).getRange());
}
boolean isSat = false;
for (T val : target.getRange()) {
if (union.contains(val)) {
isSat = true;
break;
if(!Collections.disjoint(list.get(i).getRange(), target.getRange())) {
return true;
}
}
if (!isSat) {
return false;
}
@Override
public Satisfiability getSatisfiability() {
boolean sat = isSatisfiable();
if (!sat) {
return Satisfiability.UNSAT;
} else {
if (union.size() == 1 && target.getRange().size() == 1) {
return Satisfiability.TAUT;
} else {
}
if (target.getRange().size() > 1)
return Satisfiability.SAT;
for (int i : index.getRange()) {
Var<T> var = list.get(i);
if (var.getRange().size() > 1)
return Satisfiability.SAT;
if(var.getValue() != target.getValue()) {
return Satisfiability.SAT;
}
}
return Satisfiability.TAUT;
}
}

23
src/jrummikub/ai/fdsolver/constraint/OffsetConstraint.java
View file

@ -2,6 +2,7 @@ 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;
@ -60,12 +61,24 @@ public class OffsetConstraint extends Constraint {
@Override
public Satisfiability getSatisfiability() {
HashSet<Integer> shiftedRange = new HashSet<Integer>();
for (int val : x.getRange()) {
shiftedRange.add(val + offset);
boolean disjoint = true;
if (x.getRange().size() < y.getRange().size()) {
for (int xv : x.getRange()) {
if (y.getRange().contains(xv + offset)) {
disjoint = false;
break;
}
shiftedRange.retainAll(y.getRange());
if (shiftedRange.isEmpty()) {
}
} 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;

5
src/jrummikub/ai/fdsolver/constraint/SameConstraint.java
View file

@ -2,6 +2,7 @@ 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;
@ -56,9 +57,7 @@ public class SameConstraint<T> extends Constraint {
@Override
public Satisfiability getSatisfiability() {
HashSet<T> range = new HashSet<T>(x.getRange());
range.retainAll(y.getRange());
if (range.isEmpty()) {
if (Collections.disjoint(x.getRange(), y.getRange())) {
return Satisfiability.UNSAT;
} else if (x.getRange().size() == 1 && y.getRange().size() == 1) {
return Satisfiability.TAUT;