bug 395188 - Consume new SAT4J

2 files changed, 4 insertions, 7 deletions

diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
index 092b710ec..d1b15eba1 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
@@ -215,7 +215,7 @@ public class Projector {
 				((UserFriendlyPBStringSolver<Object>) solver).setMapping(dependencyHelper.getMappingToDomain());
 			} else {
 				if (userDefinedFunction)
-					dependencyHelper = new LexicoHelper<Object, Explanation>(solver);
+					dependencyHelper = new SteppedTimeoutLexicoHelper<Object, Explanation>(solver);
 				else
 					dependencyHelper = new DependencyHelper<Object, Explanation>(solver);
 			}
@@ -1013,9 +1013,6 @@ public class Projector {
 
 	private void backToIU() {
 		solution = new ArrayList<IInstallableUnit>();
-		//		TODO WORK AROUND BECAUE OF A BUG IN SAT4J
-		if (!userDefinedFunction)
-			dependencyHelper.getSolutionCost();
 		IVec<Object> sat4jSolution = dependencyHelper.getSolution();
 		for (Iterator<Object> iter = sat4jSolution.iterator(); iter.hasNext();) {
 			Object var = iter.next();
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/UserDefinedOptimizationFunction.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/UserDefinedOptimizationFunction.java
index 65da7b0aa..7690ba39e 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/UserDefinedOptimizationFunction.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/UserDefinedOptimizationFunction.java
@@ -20,14 +20,14 @@ import org.sat4j.specs.ContradictionException;
 
 public class UserDefinedOptimizationFunction extends OptimizationFunction {
 	private Collection<IInstallableUnit> alreadyExistingRoots;
-	private LexicoHelper<Object, Explanation> dependencyHelper;
+	private SteppedTimeoutLexicoHelper<Object, Explanation> dependencyHelper;
 	private IQueryable<IInstallableUnit> picker;
 
 	public UserDefinedOptimizationFunction(IQueryable<IInstallableUnit> lastState, List<AbstractVariable> abstractVariables, List<AbstractVariable> optionalVariables, IQueryable<IInstallableUnit> picker, IInstallableUnit selectionContext, Map<String, Map<Version, IInstallableUnit>> slice, DependencyHelper<Object, Explanation> dependencyHelper, Collection<IInstallableUnit> alreadyInstalledIUs) {
 		super(lastState, abstractVariables, optionalVariables, picker, selectionContext, slice);
 		this.picker = picker;
 		this.slice = slice;
-		this.dependencyHelper = (LexicoHelper<Object, Explanation>) dependencyHelper;
+		this.dependencyHelper = (SteppedTimeoutLexicoHelper<Object, Explanation>) dependencyHelper;
 		this.alreadyExistingRoots = alreadyInstalledIUs;
 	}
 
@@ -35,7 +35,7 @@ public class UserDefinedOptimizationFunction extends OptimizationFunction {
 		List<WeightedObject<?>> weightedObjects = new ArrayList<WeightedObject<?>>();
 		List<Object> objects = new ArrayList<Object>();
 		BigInteger weight = BigInteger.valueOf(slice.size() + 1);
-		String[] criteria = new String[] {"+new", "-changed", "-notuptodate", "-removed"}; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
+		String[] criteria = new String[] {"+new", "-notuptodate", "-changed", "-removed"}; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
 		BigInteger currentWeight = weight.pow(criteria.length - 1);
 		boolean maximizes;
 		Object thing;