Some embarrassing erros. The DNF conversion for negation wasn't

[repair.git] / Repair / RepairCompiler / MCC / IR / DNFConstraint.java

diff --git a/Repair/RepairCompiler/MCC/IR/DNFConstraint.java b/Repair/RepairCompiler/MCC/IR/DNFConstraint.java
index 018df2fea7061c249748b6aaa86659cd8695ec05..55770f51614a349dcd7617fd2fe3712d1cbbe588 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/DNFConstraint.java
+++ b/Repair/RepairCompiler/MCC/IR/DNFConstraint.java
@@ -9,6 +9,11 @@ public class DNFConstraint {
        conjunctions.add(new Conjunction(new DNFPredicate(false,p)));
     }
 
+    public DNFConstraint(DNFPredicate dp) {
+       conjunctions=new Vector();
+       conjunctions.add(new Conjunction(dp));
+    }
+
     public DNFConstraint(Conjunction conj) {
        conjunctions=new Vector();
        conjunctions.add(conj);
@@ -17,7 +22,7 @@ public class DNFConstraint {
     public DNFConstraint(Vector conj) {
        conjunctions=conj;
     }
-    
+
     DNFConstraint() {
        conjunctions=new Vector();
     }
@@ -62,15 +67,23 @@ public class DNFConstraint {
 
     public DNFConstraint not() {
        DNFConstraint copy=copy();
+        DNFConstraint notconst=null;
        for (int i=0;i<size();i++) {
            Conjunction conj=copy.get(i);
+            DNFConstraint newconst=null;
            for (int j=0;j<conj.size();j++) {
                DNFPredicate dp=conj.get(j);
                dp.negatePred();
+                if (newconst==null)
+                   newconst=new DNFConstraint(dp);
+                else
+                   newconst=newconst.or(new DNFConstraint(dp));
            }
+            if (notconst==null)
+               notconst=newconst;
+            else
+               notconst=notconst.and(newconst);
        }
-       return copy;
+       return notconst;
    }
 }
-
-