Bug 267518 - Update the optimization function to take into account the patchesv20090308-0011

1 files changed, 18 insertions, 15 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 46b714e5b..74fa0c7a2 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
@@ -225,24 +225,27 @@ public class Projector {
 		maxWeight = maxWeight.multiply(POWER);
 
 		BigInteger optionalWeight = maxWeight.negate();
-		BigInteger patchWeight = maxWeight.multiply(POWER).multiply(POWER).negate();
-		if (patches != null) {
-			IRequiredCapability[] reqs = metaIu.getRequiredCapabilities();
-			for (int j = 0; j < reqs.length; j++) {
-				if (!reqs[j].isOptional())
-					continue;
-				Collector matches = picker.query(new CapabilityQuery(reqs[j]), new Collector(), null);
-				for (Iterator iterator = matches.iterator(); iterator.hasNext();) {
-					IInstallableUnit match = (IInstallableUnit) iterator.next();
-					if (match instanceof IInstallableUnitPatch)
-						weightedObjects.add(WeightedObject.newWO(match, patchWeight));
-					else
-						weightedObjects.add(WeightedObject.newWO(match, optionalWeight));
-				}
+		long countOptional = 1;
+		List requestedPatches = new ArrayList();
+		IRequiredCapability[] reqs = metaIu.getRequiredCapabilities();
+		for (int j = 0; j < reqs.length; j++) {
+			if (!reqs[j].isOptional())
+				continue;
+			Collector matches = picker.query(new CapabilityQuery(reqs[j]), new Collector(), null);
+			for (Iterator iterator = matches.iterator(); iterator.hasNext();) {
+				IInstallableUnit match = (IInstallableUnit) iterator.next();
+				if (match instanceof IInstallableUnitPatch) {
+					requestedPatches.add(match);
+					countOptional = countOptional + 1;
+				} else
+					weightedObjects.add(WeightedObject.newWO(match, optionalWeight));
 			}
-
 		}
 
+		BigInteger patchWeight = maxWeight.multiply(POWER).multiply(BigInteger.valueOf(countOptional)).negate();
+		for (Iterator iterator = requestedPatches.iterator(); iterator.hasNext();) {
+			weightedObjects.add(WeightedObject.newWO(iterator.next(), patchWeight));
+		}
 		if (!weightedObjects.isEmpty()) {
 			createObjectiveFunction(weightedObjects);
 		}