Attachment 90757 Details for Bug 220072 – Patch to fix the issue

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch to fix the issue

patch-objectivefunction.txt (text/plain), 1.91 KB, created by Timothy Webb

on 2008-02-26 11:36:44 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Webb

Created: 2008-02-26 11:36:44 EST

Size: 1.91 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.director
>Index: src/org/eclipse/equinox/internal/p2/director/PBProjector.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Attic/PBProjector.java,v
>retrieving revision 1.1.2.15
>diff -u -r1.1.2.15 PBProjector.java
>--- src/org/eclipse/equinox/internal/p2/director/PBProjector.java	26 Feb 2008 11:26:59 -0000	1.1.2.15
>+++ src/org/eclipse/equinox/internal/p2/director/PBProjector.java	26 Feb 2008 16:33:00 -0000
>@@ -17,6 +17,8 @@
> import org.osgi.framework.InvalidSyntaxException;
> import org.sat4j.pb.IPBSolver;
> import org.sat4j.pb.SolverFactory;
>+import org.sat4j.pb.core.PBSolverCP;
>+import org.sat4j.pb.orders.VarOrderHeapObjective;
> import org.sat4j.pb.reader.OPBEclipseReader2007;
> import org.sat4j.reader.ParseFormatException;
> import org.sat4j.specs.*;
>@@ -317,7 +319,7 @@
> 			return new Status(IStatus.ERROR, DirectorActivator.PI_DIRECTOR, 1, "Projection incomplete", null); //$NON-NLS-1$
> 		IPBSolver solver = SolverFactory.newEclipseP2();
> 		solver.setTimeout(60);
>-		org.sat4j.reader.Reader reader = new OPBEclipseReader2007(solver);
>+		OPBEclipseReader2007 reader = new OPBEclipseReader2007(solver);
> 		// CNF filename is given on the command line 
> 		long start = System.currentTimeMillis();
> 		if (DEBUG)
>@@ -325,7 +327,10 @@
> 		FileReader fr = null;
> 		try {
> 			fr = new FileReader(problemFile);
>-			IProblem problem = reader.parseInstance(fr);
>+			PBSolverCP problem = (PBSolverCP) reader.parseInstance(fr);
>+			if (problem.getOrder() instanceof VarOrderHeapObjective) {
>+				((VarOrderHeapObjective) problem.getOrder()).setObjectiveFunction(reader.getObjectiveFunction());
>+			}
> 			if (problem.isSatisfiable()) {
> 				if (DEBUG) {
> 					System.out.println("Satisfiable !"); //$NON-NLS-1$

Actions: View | Diff

Attachments on bug 220072: 90757