X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Repair%2FRepairCompiler%2FMCC%2FIR%2FTermination.java;h=32b4a1b56866113aee0e9125c231f9a4a84aedd4;hb=202f42f08243277d9c252e6560f8366780c5478b;hp=8aa0370964d51c712852ef95bbb73ea657fca7d7;hpb=cdd4513e39de359245e55af313d8bdea2167a253;p=repair.git

diff --git a/Repair/RepairCompiler/MCC/IR/Termination.java b/Repair/RepairCompiler/MCC/IR/Termination.java
index 8aa0370..32b4a1b 100755
--- a/Repair/RepairCompiler/MCC/IR/Termination.java
+++ b/Repair/RepairCompiler/MCC/IR/Termination.java
@@ -9,6 +9,8 @@ public class Termination {
     Hashtable conjunctionmap;
 
     HashSet abstractrepair;
+    HashSet abstractrepairadd;
+
     HashSet updatenodes;
     HashSet consequencenodes;
 
@@ -19,15 +21,23 @@ public class Termination {
     Hashtable abstractadd;
     Hashtable abstractremove;
     Hashtable conjtonodemap;
+    Hashtable predtoabstractmap;
     Set removedset;
-
+    ComputeMaxSize maxsize;
     State state;
+    AbstractInterferes abstractinterferes;
+    ConcreteInterferes concreteinterferes;
+    ConstraintDependence constraintdependence;
+    ExactSize exactsize;
+    ArrayAnalysis arrayanalysis;
+    Sources sources;
 
     public Termination(State state) {
 	this.state=state;
 	conjunctions=new HashSet();
 	conjunctionmap=new Hashtable();
 	abstractrepair=new HashSet();
+	abstractrepairadd=new HashSet();
 	scopenodes=new HashSet();
 	scopesatisfy=new Hashtable();
 	scopefalsify=new Hashtable();
@@ -37,10 +47,26 @@ public class Termination {
 	abstractadd=new Hashtable();
 	abstractremove=new Hashtable();
 	conjtonodemap=new Hashtable();
+	predtoabstractmap=new Hashtable();
 	if (!Compiler.REPAIR)
 	    return;
+	
+
+	for(int i=0;i<state.vRules.size();i++)
+	    System.out.println(state.vRules.get(i));
+	for(int i=0;i<state.vConstraints.size();i++)
+	    System.out.println(state.vConstraints.get(i));
+
+	sources=new Sources(state);
+	maxsize=new ComputeMaxSize(state);
+	exactsize=new ExactSize(state);
+	arrayanalysis=new ArrayAnalysis(state,this);
 
+	abstractinterferes=new AbstractInterferes(this);
+	concreteinterferes=new ConcreteInterferes(this);
 	generateconjunctionnodes();
+	constraintdependence=new ConstraintDependence(state,this);
+
 	generatescopenodes();
 	generaterepairnodes();
 	generatedatastructureupdatenodes();
@@ -50,14 +76,11 @@ public class Termination {
 	generatescopeedges();
 	generateupdateedges();
 
+
 	HashSet superset=new HashSet();
 	superset.addAll(conjunctions);
 	HashSet closureset=new HashSet();
-	//	closureset.addAll(updatenodes);
-	//superset.addAll(abstractrepair);
-	//superset.addAll(updatenodes);
-	//superset.addAll(scopenodes);
-	//superset.addAll(consequencenodes);
+
 	GraphNode.computeclosure(superset,closureset);
 	try {
 	    GraphNode.DOTVisitor.visit(new FileOutputStream("graph.dot"),superset);
@@ -78,6 +101,7 @@ public class Termination {
 	    System.out.println("Can't generate terminating repair algorithm!");
 	    System.exit(-1);
 	}
+
 	System.out.println("Removing:");
 	for(Iterator it=removedset.iterator();it.hasNext();) {
 	    GraphNode gn=(GraphNode)it.next();
@@ -94,11 +118,18 @@ public class Termination {
 	    e.printStackTrace();
 	    System.exit(-1);
 	}
-
+	constraintdependence.traversedependences(this);
     }
-    
+
+
+    /** This method generates a node for each conjunction in the DNF
+     * form of each constraint.  It also converts the quantifiers into
+     * conjunctions also - constraints can be satisfied by removing
+     * items from the sets and relations they are quantified over */
+
     void generateconjunctionnodes() {
 	Vector constraints=state.vConstraints;
+	// Constructs conjunction nodes
 	for(int i=0;i<constraints.size();i++) {
 	    Constraint c=(Constraint)constraints.get(i);
 	    DNFConstraint dnf=c.dnfconstraint;
@@ -113,6 +144,7 @@ public class Termination {
 		((Set)conjunctionmap.get(c)).add(gn);
 		conjtonodemap.put(dnf.get(j),gn);
 	    }
+	    // Construct quantifier "conjunction" nodes
 	    for(int j=0;j<c.numQuantifiers();j++) {
 		Quantifier q=c.getQuantifier(j);
 		if (q instanceof SetQuantifier) {
@@ -122,6 +154,7 @@ public class Termination {
 		    DNFConstraint dconst=new DNFConstraint(ip);
 		    dconst=dconst.not();
 		    TermNode tn=new TermNode(c,dconst.get(0));
+		    tn.setquantifiernode();
 		    GraphNode gn=new GraphNode("Conj"+i+"AQ"+j,
 					       "Conj ("+i+","+j+") "+dconst.get(0).name()
 					       ,tn);
@@ -130,6 +163,7 @@ public class Termination {
 			conjunctionmap.put(c,new HashSet());
 		    ((Set)conjunctionmap.get(c)).add(gn);
 		    conjtonodemap.put(dconst.get(0),gn);
+
 		} else if (q instanceof RelationQuantifier) {
 		    RelationQuantifier rq=(RelationQuantifier)q;
 		    VarExpr ve=new VarExpr(rq.y);
@@ -137,6 +171,7 @@ public class Termination {
 		    DNFConstraint dconst=new DNFConstraint(ip);
 		    dconst=dconst.not();
 		    TermNode tn=new TermNode(c,dconst.get(0));
+		    tn.setquantifiernode();
 		    GraphNode gn=new GraphNode("Conj"+i+"AQ"+j,
 					       "Conj ("+i+","+j+") "+dconst.get(0).name()
 					       ,tn);
@@ -145,6 +180,7 @@ public class Termination {
 			conjunctionmap.put(c,new HashSet());
 		    ((Set)conjunctionmap.get(c)).add(gn);
 		    conjtonodemap.put(dconst.get(0),gn);
+
 		}
 	    }
 	}
@@ -155,15 +191,49 @@ public class Termination {
 	    GraphNode gn=(GraphNode)updateiterator.next();
 	    TermNode tn=(TermNode)gn.getOwner();
 	    MultUpdateNode mun=tn.getUpdate();
+	    for(int i=0;i<mun.numUpdates();i++) {
+		UpdateNode un=mun.getUpdate(i);
+		for(int j=0;j<un.numUpdates();j++) {
+		    Updates u=un.getUpdate(j);
+		    if (u.getType()==Updates.ABSTRACT) {
+			Expr e=u.getLeftExpr();
+			boolean negated=u.negate;
+			if (e instanceof TupleOfExpr) {
+			    TupleOfExpr toe=(TupleOfExpr)e;
+			    if (negated) {
+				GraphNode agn=(GraphNode)abstractremove.get(toe.relation);
+				GraphNode.Edge edge=new GraphNode.Edge("requires",agn);
+				gn.addEdge(edge);
+			    } else {
+				GraphNode agn=(GraphNode)abstractadd.get(toe.relation);
+				GraphNode.Edge edge=new GraphNode.Edge("requires",agn);
+				gn.addEdge(edge);
+			    }
+			} else if (e instanceof ElementOfExpr) {
+			    ElementOfExpr eoe=(ElementOfExpr)e;
+			    if (negated) {
+				GraphNode agn=(GraphNode)abstractremove.get(eoe.set);
+				GraphNode.Edge edge=new GraphNode.Edge("requires",agn);
+				gn.addEdge(edge);
+			    } else {
+				GraphNode agn=(GraphNode)abstractadd.get(eoe.set);
+				GraphNode.Edge edge=new GraphNode.Edge("requires",agn);
+				gn.addEdge(edge);
+			    }
+			} else throw new Error("Unrecognized Abstract Update");
+		    }
+		}
+	    }
+
 	    /* Cycle through the rules to look for possible conflicts */
 	    for(int i=0;i<state.vRules.size();i++) {
 		Rule r=(Rule) state.vRules.get(i);  
-		if (ConcreteInterferes.interferes(mun,r,true)) {
+		if (concreteinterferes.interferes(mun,r,true)) {
 		    GraphNode scopenode=(GraphNode)scopesatisfy.get(r);
 		    GraphNode.Edge e=new GraphNode.Edge("interferes",scopenode);
 		    gn.addEdge(e);
 		}
-		if (ConcreteInterferes.interferes(mun,r,false)) {
+		if (concreteinterferes.interferes(mun,r,false)) {
 		    GraphNode scopenode=(GraphNode)scopefalsify.get(r);
 		    GraphNode.Edge e=new GraphNode.Edge("interferes",scopenode);
 		    gn.addEdge(e);
@@ -186,8 +256,9 @@ public class Termination {
 
 		for(int i=0;i<conj.size();i++) {
 		    DNFPredicate dp=conj.get(i);
+		    System.out.println("Checking "+gn.getTextLabel()+" --> "+gn2.getTextLabel());
 		    if (AbstractInterferes.interferes(ar,cons)||
-			AbstractInterferes.interferes(ar,dp)) {
+			abstractinterferes.interferes(ar,dp)) {
 			GraphNode.Edge e=new GraphNode.Edge("interferes",gn2);
 			gn.addEdge(e);
 			break;
@@ -206,6 +277,37 @@ public class Termination {
 	    }
 	}
     }
+
+    void generatescopenodes() {
+	for(int i=0;i<state.vRules.size();i++) {
+	    Rule r=(Rule) state.vRules.get(i);
+	    ScopeNode satisfy=new ScopeNode(r,true);
+	    TermNode tnsatisfy=new TermNode(satisfy);
+	    GraphNode gnsatisfy=new GraphNode("SatisfyRule"+i,tnsatisfy);
+	    ConsequenceNode cnsatisfy=new ConsequenceNode();
+	    TermNode ctnsatisfy=new TermNode(cnsatisfy);
+	    GraphNode cgnsatisfy=new GraphNode("ConseqSatisfyRule"+i,ctnsatisfy);
+	    consequence.put(satisfy,cgnsatisfy);
+	    GraphNode.Edge esat=new GraphNode.Edge("consequencesatisfy"+i,cgnsatisfy);
+	    gnsatisfy.addEdge(esat);
+	    consequencenodes.add(cgnsatisfy);
+	    scopesatisfy.put(r,gnsatisfy);
+	    scopenodes.add(gnsatisfy);
+
+	    ScopeNode falsify=new ScopeNode(r,false);
+	    TermNode tnfalsify=new TermNode(falsify);
+	    GraphNode gnfalsify=new GraphNode("FalsifyRule"+i,tnfalsify);
+	    ConsequenceNode cnfalsify=new ConsequenceNode();
+	    TermNode ctnfalsify=new TermNode(cnfalsify);
+	    GraphNode cgnfalsify=new GraphNode("ConseqFalsifyRule"+i,ctnfalsify);
+	    consequence.put(falsify,cgnfalsify);
+	    GraphNode.Edge efals=new GraphNode.Edge("consequencefalsify"+i,cgnfalsify);
+	    gnfalsify.addEdge(efals);
+	    consequencenodes.add(cgnfalsify);
+	    scopefalsify.put(r,gnfalsify);
+	    scopenodes.add(gnfalsify);
+	}
+    }
     
     void generatescopeedges() {
 	for(Iterator scopeiterator=scopenodes.iterator();scopeiterator.hasNext();) {
@@ -221,7 +323,7 @@ public class Termination {
 		Constraint constr=tn2.getConstraint();
 		for(int i=0;i<conj.size();i++) {
 		    DNFPredicate dp=conj.get(i);
-		    if (AbstractInterferes.interferes(sn,dp)||
+		    if (abstractinterferes.interferes(sn,dp)||
 			AbstractInterferes.interferes(sn.getDescriptor(),sn.getSatisfy(),constr)) {
 			GraphNode.Edge e=new GraphNode.Edge("interferes",gn2);
 			GraphNode gnconseq=(GraphNode)consequence.get(sn);
@@ -250,7 +352,7 @@ public class Termination {
 	}
     }
 
-    /* Generates the abstract repair nodes */
+    /** This method generates the abstract repair nodes. */
     void generaterepairnodes() {
 	/* Generate repairs of conjunctions */
 	for(Iterator conjiterator=conjunctions.iterator();conjiterator.hasNext();) {
@@ -259,7 +361,7 @@ public class Termination {
 	    Conjunction conj=tn.getConjunction();
 	    for(int i=0;i<conj.size();i++) {
 		DNFPredicate dp=conj.get(i);
-		int[] array=dp.getPredicate().getRepairs(dp.isNegated());
+		int[] array=dp.getPredicate().getRepairs(dp.isNegated(),this);
 		Descriptor d=dp.getPredicate().getDescriptor();
 		for(int j=0;j<array.length;j++) {
 		    AbstractRepair ar=new AbstractRepair(dp,array[j],d);
@@ -267,6 +369,9 @@ public class Termination {
 		    GraphNode gn2=new GraphNode(gn.getLabel()+"A"+i+"B"+ar.type(),gn.getTextLabel()+" #"+i+" "+ar.type(),tn2);
 		    GraphNode.Edge e=new GraphNode.Edge("abstract",gn2);
 		    gn.addEdge(e);
+		    if (!predtoabstractmap.containsKey(dp))
+			predtoabstractmap.put(dp,new HashSet());
+		    ((Set)predtoabstractmap.get(dp)).add(gn2);
 		    abstractrepair.add(gn2);
 		}
 	    }
@@ -276,30 +381,34 @@ public class Termination {
 	for(int i=0;i<setdescriptors.size();i++) {
 	    SetDescriptor sd=(SetDescriptor)setdescriptors.get(i);
 
-	    /* XXXXXXX: Not sure what to do here */
 	    VarExpr ve=new VarExpr("DUMMY");
 	    InclusionPredicate ip=new InclusionPredicate(ve,new SetExpr(sd));
-	    
 	    DNFPredicate tp=new DNFPredicate(false,ip);
 	    AbstractRepair ar=new AbstractRepair(tp, AbstractRepair.ADDTOSET, sd);
 	    TermNode tn=new TermNode(ar);
 	    GraphNode gn=new GraphNode("AbstractAddSetRule"+i,tn);
+	    if (!predtoabstractmap.containsKey(tp))
+		predtoabstractmap.put(tp,new HashSet());
+	    ((Set)predtoabstractmap.get(tp)).add(gn);
 	    abstractrepair.add(gn);
+	    abstractrepairadd.add(gn);
 	    abstractadd.put(sd,gn);
 	    
 	    DNFPredicate tp2=new DNFPredicate(true,ip);
 	    AbstractRepair ar2=new AbstractRepair(tp2, AbstractRepair.REMOVEFROMSET, sd);
 	    TermNode tn2=new TermNode(ar2);
 	    GraphNode gn2=new GraphNode("AbstractRemSetRule"+i,tn2);
+	    if (!predtoabstractmap.containsKey(tp2))
+		predtoabstractmap.put(tp2,new HashSet());
+	    ((Set)predtoabstractmap.get(tp2)).add(gn2);
 	    abstractrepair.add(gn2);
+	    abstractrepairadd.add(gn2);
 	    abstractremove.put(sd,gn2);
 	}
 
 	Vector relationdescriptors=state.stRelations.getAllDescriptors();
 	for(int i=0;i<relationdescriptors.size();i++) {
 	    RelationDescriptor rd=(RelationDescriptor)relationdescriptors.get(i);
-
-	    /* XXXXXXX: Not sure what to do here */
 	    VarDescriptor vd1=new VarDescriptor("DUMMY1");
 	    VarExpr ve2=new VarExpr("DUMMY2");
 
@@ -309,17 +418,24 @@ public class Termination {
 	    AbstractRepair ar=new AbstractRepair(tp, AbstractRepair.ADDTORELATION, rd);
 	    TermNode tn=new TermNode(ar);
 	    GraphNode gn=new GraphNode("AbstractAddRelRule"+i,tn);
+	    if (!predtoabstractmap.containsKey(tp))
+		predtoabstractmap.put(tp,new HashSet());
+	    ((Set)predtoabstractmap.get(tp)).add(gn);
 	    abstractrepair.add(gn);
+	    abstractrepairadd.add(gn);
 	    abstractadd.put(rd,gn);
 	    
 	    DNFPredicate tp2=new DNFPredicate(true,ip);
 	    AbstractRepair ar2=new AbstractRepair(tp2, AbstractRepair.REMOVEFROMRELATION, rd);
 	    TermNode tn2=new TermNode(ar2);
 	    GraphNode gn2=new GraphNode("AbstractRemRelRule"+i,tn2);
+	    if (!predtoabstractmap.containsKey(tp2))
+		predtoabstractmap.put(tp2,new HashSet());
+	    ((Set)predtoabstractmap.get(tp2)).add(gn2);
 	    abstractrepair.add(gn2);
+	    abstractrepairadd.add(gn2);
 	    abstractremove.put(rd,gn2);
 	}
-	
     }
 
     int compensationcount=0;
@@ -327,11 +443,7 @@ public class Termination {
 	for(int i=0;i<state.vRules.size();i++) {
 	    Rule r=(Rule) state.vRules.get(i);
 	    Vector possiblerules=new Vector();
-	    /* Construct bindings */
-	    /* No need to construct bindings on remove
-	       Vector bindings=new Vector();
-	       constructbindings(bindings, r,true);
-	    */
+
 	    for(int j=0;j<(r.numQuantifiers()+r.getDNFNegGuardExpr().size());j++) {
 		GraphNode gn=(GraphNode)scopesatisfy.get(r);
 		TermNode tn=(TermNode) gn.getOwner();
@@ -340,8 +452,7 @@ public class Termination {
 		TermNode tn2=new TermNode(mun);
 		GraphNode gn2=new GraphNode("CompRem"+compensationcount,tn2);
 		UpdateNode un=new UpdateNode(r);
-		//		un.addBindings(bindings);
-		// Not necessary
+
 		if (j<r.numQuantifiers()) {
 		    /* Remove quantifier */
 		    Quantifier q=r.getQuantifier(j);
@@ -375,6 +486,7 @@ public class Termination {
 			continue;
 		    }
 		} else {
+		    /* Negate conjunction */
 		    int c=j-r.numQuantifiers();
 		    if (!processconjunction(un,r.getDNFNegGuardExpr().get(c))) {
 			continue;
@@ -384,7 +496,6 @@ public class Termination {
 		    continue;
 		
 		mun.addUpdate(un);
-
 		GraphNode.Edge e=new GraphNode.Edge("abstract"+compensationcount,gn2);
 		compensationcount++;
 		gn.addEdge(e);
@@ -416,8 +527,14 @@ public class Termination {
 	}
     }
 
+
+    /** This method generates concrete data structure updates which
+     * remove an object (or tuple) from a set (or relation).*/
+
     int removefromcount=0;
     void generateremovefromsetrelation(GraphNode gn,AbstractRepair ar) {
+	/* Construct the set of all rules which could add something to the given set or relation */
+
 	Vector possiblerules=new Vector();
 	for(int i=0;i<state.vRules.size();i++) {
 	    Rule r=(Rule) state.vRules.get(i);
@@ -430,6 +547,8 @@ public class Termination {
 	}
 	if (possiblerules.size()==0)
 	    return;
+	
+	/* Loop through different ways of falsifying each of these rules */
 	int[] count=new int[possiblerules.size()];
 	while(remains(count,possiblerules,true)) {
 	    MultUpdateNode mun=new MultUpdateNode(ar,MultUpdateNode.REMOVE);
@@ -440,11 +559,7 @@ public class Termination {
 	    for(int i=0;i<possiblerules.size();i++) {
 		Rule r=(Rule)possiblerules.get(i);
 		UpdateNode un=new UpdateNode(r);
-		/* Construct bindings */
-		/* No Need to construct bindings on remove
-		   Vector bindings=new Vector();
-		   constructbindings(bindings, r,true);
-		  un.addBindings(bindings);*/
+
 		if (count[i]<r.numQuantifiers()) {
 		    /* Remove quantifier */
 		    Quantifier q=r.getQuantifier(count[i]);
@@ -497,7 +612,9 @@ public class Termination {
 	}
     }
 
-    static void increment(int count[], Vector rules,boolean isremove) {
+    /** This method increments to the next possibility. */
+
+    static private void increment(int count[], Vector rules,boolean isremove) {
 	count[0]++;
 	for(int i=0;i<(rules.size()-1);i++) {
 	    int num=isremove?(((Rule)rules.get(i)).numQuantifiers()+(((Rule)rules.get(i)).getDNFNegGuardExpr().size())):((Rule)rules.get(i)).getDNFGuardExpr().size();
@@ -508,7 +625,10 @@ public class Termination {
 	}
     }
 
-    static boolean remains(int count[], Vector rules, boolean isremove) {
+
+    /** This method test if there remain any possibilities to loop
+     * through. */
+    static private boolean remains(int count[], Vector rules, boolean isremove) {
 	for(int i=0;i<rules.size();i++) {
 	    int num=isremove?(((Rule)rules.get(i)).numQuantifiers()+(((Rule)rules.get(i)).getDNFNegGuardExpr().size())):((Rule)rules.get(i)).getDNFGuardExpr().size();
 	    if (count[i]>=num) {
@@ -520,6 +640,7 @@ public class Termination {
 
     /** This method generates data structure updates to implement the
      * 	abstract atomic modification specified by ar. */
+
     int modifycount=0;
     void generatemodifyrelation(GraphNode gn, AbstractRepair ar) {
 	RelationDescriptor rd=(RelationDescriptor)ar.getDescriptor();
@@ -532,7 +653,7 @@ public class Termination {
 	else 
 	    rightindex=2;
 
-
+	// construct set of possible rules
 	Vector possiblerules=new Vector();
 	for(int i=0;i<state.vRules.size();i++) {
 	    Rule r=(Rule) state.vRules.get(i);
@@ -542,6 +663,8 @@ public class Termination {
 	}
 	if (possiblerules.size()==0)
 	    return;
+
+	// increment through this set
 	int[] count=new int[possiblerules.size()];
 	while(remains(count,possiblerules,false)) {
 	    MultUpdateNode mun=new MultUpdateNode(ar,MultUpdateNode.MODIFY);
@@ -552,7 +675,6 @@ public class Termination {
 	    for(int i=0;i<possiblerules.size();i++) {
 		Rule r=(Rule)possiblerules.get(i);
 		UpdateNode un=new UpdateNode(r);
-		/* No Need to construct bindings on modify */
 		
 		int c=count[i];
 		if (!processconjunction(un,r.getDNFGuardExpr().get(c))) {
@@ -560,8 +682,14 @@ public class Termination {
 		}
 		RelationInclusion ri=(RelationInclusion)r.getInclusion();
 		if (!(ri.getLeftExpr() instanceof VarExpr)) {
-		    Updates up=new Updates(ri.getLeftExpr(),leftindex);
-		    un.addUpdate(up);
+		    if (ri.getLeftExpr().isValue()) {
+			Updates up=new Updates(ri.getLeftExpr(),leftindex);
+			un.addUpdate(up);
+		    } else {
+			if (inverted)
+			    goodflag=false;
+			else un.addInvariant(ri.getLeftExpr());
+		    }
 		} else {
 		    VarDescriptor vd=((VarExpr)ri.getLeftExpr()).getVar();
 		    if (vd.isGlobal()) {
@@ -571,8 +699,15 @@ public class Termination {
 			goodflag=false;
 		}
 		if (!(ri.getRightExpr() instanceof VarExpr)) {
-		    Updates up=new Updates(ri.getRightExpr(),rightindex);
-		    un.addUpdate(up);
+		    if (ri.getRightExpr().isValue()) {
+			Updates up=new Updates(ri.getRightExpr(),rightindex);
+			un.addUpdate(up);
+		    } else {
+			if (!inverted)
+			    goodflag=false;
+			else
+			    un.addInvariant(ri.getLeftExpr());
+		    }
 		} else {
 		    VarDescriptor vd=((VarExpr)ri.getRightExpr()).getVar();
 		    if (vd.isGlobal()) {
@@ -598,6 +733,178 @@ public class Termination {
 	}
     }
 
+    /** Generate concrete data structure update to add an object(or
+     * tuple) to a set (or relation). */
+
+    static int addtocount=0;
+    void generateaddtosetrelation(GraphNode gn, AbstractRepair ar) {
+	for(int i=0;i<state.vRules.size();i++) {
+	    Rule r=(Rule) state.vRules.get(i);
+	    /* See if this is a good rule*/
+	    if ((r.getInclusion() instanceof SetInclusion&&
+		 ar.getDescriptor()==((SetInclusion)r.getInclusion()).getSet())||
+		(r.getInclusion() instanceof RelationInclusion&&
+		 ar.getDescriptor()==((RelationInclusion)r.getInclusion()).getRelation())) {
+		
+		/* First solve for quantifiers */
+		Vector bindings=new Vector();
+		/* Construct bindings */
+		if (!constructbindings(bindings,r,false))
+		    continue;
+		//Generate add instruction
+		DNFRule dnfrule=r.getDNFGuardExpr();
+		for(int j=0;j<dnfrule.size();j++) {
+		    Inclusion inc=r.getInclusion();
+		    UpdateNode un=new UpdateNode(r);
+		    un.addBindings(bindings);
+		    /* Now build update for tuple/set inclusion condition */
+		    if(inc instanceof SetInclusion) {
+			SetInclusion si=(SetInclusion)inc;
+			if (!(si.elementexpr instanceof VarExpr)) {
+			    if (si.elementexpr.isValue()) {
+				Updates up=new Updates(si.elementexpr,0);
+				un.addUpdate(up);
+			    } else {
+				/* We're an add to set*/
+				System.out.println("Rule: "+r);
+				ArrayAnalysis.AccessPath rap=arrayanalysis.analyzeExpr(r,si.elementexpr);
+				System.out.println("Attempting perform array add");
+				SetDescriptor set=sources.setSource(si.getSet())?
+				    sources.getSourceSet(si.getSet()):null;
+				if (set==null)
+				    continue;
+				System.out.println("Non-null source set");
+				ArrayAnalysis.AccessPath ap=arrayanalysis.getSet(set);
+				if (rap==ArrayAnalysis.AccessPath.NONE)
+				    continue;
+				System.out.println("A");
+				if (!rap.equal(ap))
+				    continue;
+				System.out.println("B");
+				if (!constructarrayupdate(un, si.elementexpr, rap, 0))
+				    continue;
+				System.out.println("C");
+			    }
+			} else {
+			    VarDescriptor vd=((VarExpr)si.elementexpr).getVar();
+			    if (vd.isGlobal()) {
+				Updates up=new Updates(si.elementexpr,0);
+				un.addUpdate(up);
+			    }
+			}
+		    } else if (inc instanceof RelationInclusion) {
+			RelationInclusion ri=(RelationInclusion)inc;
+			if (!(ri.getLeftExpr() instanceof VarExpr)) {
+			    if (ri.getLeftExpr().isValue()) {
+				Updates up=new Updates(ri.getLeftExpr(),0);
+				un.addUpdate(up);
+			    } else {
+				/* We don't handly relation modifies */
+				if (ar.getType()==AbstractRepair.MODIFYRELATION)
+				    continue;
+				/* We're an add to relation*/
+				ArrayAnalysis.AccessPath rap=arrayanalysis.analyzeExpr(r,ri.getLeftExpr());
+				SetDescriptor set=sources.relsetSource(ri.getRelation(),true /* Domain*/)?
+				    sources.relgetSourceSet(ri.getRelation(),true):null;
+				if (set==null)
+				    continue;
+				ArrayAnalysis.AccessPath ap=arrayanalysis.getSet(set);
+				
+				if (rap==ArrayAnalysis.AccessPath.NONE||
+				    !rap.equal(ap)||
+				    !constructarrayupdate(un, ri.getLeftExpr(), rap, 0))
+				    continue;
+			    }
+			} else {
+			    VarDescriptor vd=((VarExpr)ri.getLeftExpr()).getVar();
+			    if (vd.isGlobal()) {
+				Updates up=new Updates(ri.getLeftExpr(),0);
+				un.addUpdate(up);
+			    }
+     			}
+			if (!(ri.getRightExpr() instanceof VarExpr)) {
+			    if (ri.getRightExpr().isValue()) {
+				Updates up=new Updates(ri.getRightExpr(),1);
+				un.addUpdate(up);
+			    } else {
+				/* We don't handly relation modifies */
+				if (ar.getType()==AbstractRepair.MODIFYRELATION)
+				    continue;
+				/* We're an add to relation*/
+				ArrayAnalysis.AccessPath rap=arrayanalysis.analyzeExpr(r,ri.getRightExpr());
+				SetDescriptor set=sources.relsetSource(ri.getRelation(),false /* Range*/)?
+				    sources.relgetSourceSet(ri.getRelation(),false):null;
+				if (set==null)
+				    continue;
+				ArrayAnalysis.AccessPath ap=arrayanalysis.getSet(set);
+				
+				if (rap==ArrayAnalysis.AccessPath.NONE||
+				    !rap.equal(ap)||
+				    !constructarrayupdate(un, ri.getRightExpr(), rap, 1))
+				    continue;
+			    }
+			} else {
+			    VarDescriptor vd=((VarExpr)ri.getRightExpr()).getVar();
+			    if (vd.isGlobal()) {
+				Updates up=new Updates(ri.getRightExpr(),1);
+				un.addUpdate(up);
+			    }
+			}
+		    }
+		    //Finally build necessary updates to satisfy conjunction
+		    RuleConjunction ruleconj=dnfrule.get(j);
+
+		    /* Add in updates for quantifiers */
+		    MultUpdateNode mun=new MultUpdateNode(ar,MultUpdateNode.ADD);
+		    TermNode tn=new TermNode(mun);
+		    GraphNode gn2=new GraphNode("UpdateAdd"+addtocount,tn);
+
+		    if (processquantifiers(gn2,un, r)&&
+			processconjunction(un,ruleconj)&&
+			un.checkupdates()) {
+			mun.addUpdate(un);
+			GraphNode.Edge e=new GraphNode.Edge("abstract"+addtocount,gn2);
+			addtocount++;
+			gn.addEdge(e);
+			updatenodes.add(gn2);
+		    }
+		}
+	    }
+	}
+    }
+
+    boolean constructarrayupdate(UpdateNode un, Expr lexpr, ArrayAnalysis.AccessPath ap, int slotnumber) {
+	System.out.println("Constructing array update");
+	Expr e=null;
+	for (int i=ap.numFields()-1;i>=0;i--) {
+	    if (e==null)
+		e=lexpr;
+	    else 
+		e=((DotExpr)e).getExpr();
+
+	    while (e instanceof CastExpr)
+		e=((CastExpr)e).getExpr();
+
+	    DotExpr de=(DotExpr)e;
+	    FieldDescriptor fd=ap.getField(i);
+	    if (fd instanceof ArrayDescriptor) {
+		// We have an ArrayDescriptor!
+		Expr index=de.getIndex();
+		if (!index.isValue()) {/* Not assignable */
+		    System.out.println("ERROR:Index isn't assignable");
+		    return false;
+		}
+		Updates updates=new Updates(index,i,ap,lexpr,slotnumber);
+		un.addUpdate(updates);
+	    }
+	}
+	return true;
+    }
+
+    /** This method constructs bindings for an update using rule
+     * r. The boolean flag isremoval indicates that the update
+     * performs a removal.  The function returns true if it is able to
+     * generate a valid set of bindings and false otherwise. */
 
     boolean constructbindings(Vector bindings, Rule r, boolean isremoval) {
 	boolean goodupdate=true;
@@ -609,8 +916,10 @@ public class Termination {
 		SetDescriptor set=null;
 		if (q instanceof SetQuantifier) {
 		    vd=((SetQuantifier)q).getVar();
-		} else
+		    set=((SetQuantifier)q).getSet();
+		} else {
 		    vd=((ForQuantifier)q).getVar();
+		}
 		if(inc instanceof SetInclusion) {
 		    SetInclusion si=(SetInclusion)inc;
 		    if ((si.elementexpr instanceof VarExpr)&&
@@ -618,8 +927,9 @@ public class Termination {
 			/* Can solve for v */
 			Binding binding=new Binding(vd,0);
 			bindings.add(binding);
-		    } else
+		    } else {
 			goodupdate=false;
+		    }
 		} else if (inc instanceof RelationInclusion) {
 		    RelationInclusion ri=(RelationInclusion)inc;
 		    boolean f1=true;
@@ -641,11 +951,19 @@ public class Termination {
 		} else throw new Error("Inclusion not recognized");
 		if (!goodupdate)
 		    if (isremoval) {
-			Binding binding=new Binding(vd);
+			/* Removals don't need bindings anymore
+			   Binding binding=new Binding(vd);
+			   bindings.add(binding);*/
+			goodupdate=true;
+		    } else if (q instanceof SetQuantifier) {
+			/* Create new element to bind to */
+			// search if the set 'set' has a size
+			Binding binding=new Binding(vd,set,exactsize.getsize(set)==1);
 			bindings.add(binding);
 			goodupdate=true;
+
 		    } else
-			break;
+			goodupdate=false;
 	    } else if (q instanceof RelationQuantifier) {
 		RelationQuantifier rq=(RelationQuantifier)q;
 		for(int k=0;k<2;k++) {
@@ -680,8 +998,9 @@ public class Termination {
 		    } else throw new Error("Inclusion not recognized");
 		    if (!goodupdate)
 			if (isremoval) {
-			    Binding binding=new Binding(vd);
-			    bindings.add(binding);
+			    /* Removals don't need bindings anymore
+			       Binding binding=new Binding(vd);
+			       bindings.add(binding);*/
 			    goodupdate=true;
 			} else
 			    break;
@@ -692,98 +1011,11 @@ public class Termination {
 	}
 	return goodupdate;
     }
-
-    static int addtocount=0;
-    void generateaddtosetrelation(GraphNode gn, AbstractRepair ar) {
-	//	System.out.println("Attempting to generate add to set");
-	//System.out.println(ar.getPredicate().getPredicate().name());
-	//System.out.println(ar.getPredicate().isNegated());
-	for(int i=0;i<state.vRules.size();i++) {
-	    Rule r=(Rule) state.vRules.get(i);
-	    /* See if this is a good rule*/
-	    //System.out.println(r.getGuardExpr().name());
-	    if ((r.getInclusion() instanceof SetInclusion&&
-		ar.getDescriptor()==((SetInclusion)r.getInclusion()).getSet())||
-		(r.getInclusion() instanceof RelationInclusion&&
-		 ar.getDescriptor()==((RelationInclusion)r.getInclusion()).getRelation())) {
-
-		/* First solve for quantifiers */
-		Vector bindings=new Vector();
-		/* Construct bindings */
-		//System.out.println("Attempting to generate add to set: #2");
-		if (!constructbindings(bindings,r,false))
-		    continue;
-		//System.out.println("Attempting to generate add to set: #3");
-		//Generate add instruction
-		DNFRule dnfrule=r.getDNFGuardExpr();
-		for(int j=0;j<dnfrule.size();j++) {
-		    Inclusion inc=r.getInclusion();
-		    UpdateNode un=new UpdateNode(r);
-		    un.addBindings(bindings);
-		    /* Now build update for tuple/set inclusion condition */
-		    if(inc instanceof SetInclusion) {
-			SetInclusion si=(SetInclusion)inc;
-			if (!(si.elementexpr instanceof VarExpr)) {
-			    Updates up=new Updates(si.elementexpr,0);
-			    un.addUpdate(up);
-			} else {
-			    VarDescriptor vd=((VarExpr)si.elementexpr).getVar();
-			    if (un.getBinding(vd)==null) {
-				Updates up=new Updates(si.elementexpr,0);
-				un.addUpdate(up);
-			    }
-			}
-		    } else if (inc instanceof RelationInclusion) {
-			RelationInclusion ri=(RelationInclusion)inc;
-			if (!(ri.getLeftExpr() instanceof VarExpr)) {
-			    Updates up=new Updates(ri.getLeftExpr(),0);
-			    un.addUpdate(up);
-			} else {
-			    VarDescriptor vd=((VarExpr)ri.getLeftExpr()).getVar();
-			    if (un.getBinding(vd)==null) {
-				Updates up=new Updates(ri.getLeftExpr(),0);
-				un.addUpdate(up);
-			    }
-     			}
-			if (!(ri.getRightExpr() instanceof VarExpr)) {
-			    Updates up=new Updates(ri.getRightExpr(),1);
-			    un.addUpdate(up);
-			} else {
-			    VarDescriptor vd=((VarExpr)ri.getRightExpr()).getVar();
-			    if (un.getBinding(vd)==null) {
-				Updates up=new Updates(ri.getRightExpr(),1);
-				un.addUpdate(up);
-			    }
-			}
-		    }
-		    //Finally build necessary updates to satisfy conjunction
-		    RuleConjunction ruleconj=dnfrule.get(j);
-		    /* Add in updates for quantifiers */
-		    //System.out.println("Attempting to generate add to set #4");
-		    MultUpdateNode mun=new MultUpdateNode(ar,MultUpdateNode.ADD);
-		    TermNode tn=new TermNode(mun);
-		    GraphNode gn2=new GraphNode("UpdateAdd"+addtocount,tn);
-
-		    if (processquantifers(gn2,un, r)&&debugdd()&&
-			processconjunction(un,ruleconj)&&
-			un.checkupdates()) {
-			//System.out.println("Attempting to generate add to set #5");
-			mun.addUpdate(un);
-			GraphNode.Edge e=new GraphNode.Edge("abstract"+addtocount,gn2);
-			addtocount++;
-			gn.addEdge(e);
-			updatenodes.add(gn2);}
-		}
-	    }
-	}
-    }
-
-    boolean debugdd() {
-	//System.out.println("Attempting to generate add to set DD");
-	return true;
-    }
-
-    boolean processquantifers(GraphNode gn,UpdateNode un, Rule r) {
+    
+    /** Adds updates that add an item to the appropriate set or
+     * relation quantified over by the model definition rule.. */
+    
+    boolean processquantifiers(GraphNode gn,UpdateNode un, Rule r) {
 	Inclusion inc=r.getInclusion();
 	for(Iterator iterator=r.quantifiers();iterator.hasNext();) {
 	    Quantifier q=(Quantifier)iterator.next();
@@ -795,21 +1027,28 @@ public class Termination {
 		toe.td=ReservedTypeDescriptor.INT;
 		Updates u=new Updates(toe,false);
 		un.addUpdate(u);
-		if (abstractremove.containsKey(rq.relation)) {
+		if (abstractadd.containsKey(rq.relation)) {
 		    GraphNode agn=(GraphNode)abstractadd.get(rq.relation);
 		    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
 		    gn.addEdge(e);
 		} else {
 		    return false;
 		}
-
+		
 	    } else if (q instanceof SetQuantifier) {
 		SetQuantifier sq=(SetQuantifier)q;
+		if (un.getBinding(sq.var).getType()==Binding.SEARCH) {
+		    Binding b=un.getBinding(sq.var);
+		    Constraint reqc=exactsize.getConstraint(b.getSet());
+		    constraintdependence.requiresConstraint(gn,reqc);
+		    continue; /* Don't need to ensure addition for search */
+		}
+
 		ElementOfExpr eoe=new ElementOfExpr(new VarExpr(sq.var),sq.set);
 		eoe.td=ReservedTypeDescriptor.INT;
 		Updates u=new Updates(eoe,false);
 		un.addUpdate(u);
-		if (abstractremove.containsKey(sq.set)) {
+		if (abstractadd.containsKey(sq.set)) {
 		    GraphNode agn=(GraphNode)abstractadd.get(sq.set);
 		    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
 		    gn.addEdge(e);
@@ -821,6 +1060,9 @@ public class Termination {
 	return true;
     }
 
+    /** This method generates the necessary updates to satisfy the
+     * conjunction ruleconj. */
+
     boolean  processconjunction(UpdateNode un,RuleConjunction ruleconj){
 	boolean okay=true;
 	for(int k=0;k<ruleconj.size();k++) {
@@ -853,34 +1095,62 @@ public class Termination {
 	return okay;
     }
 
-    void generatescopenodes() {
-	for(int i=0;i<state.vRules.size();i++) {
-	    Rule r=(Rule) state.vRules.get(i);
-	    ScopeNode satisfy=new ScopeNode(r,true);
-	    TermNode tnsatisfy=new TermNode(satisfy);
-	    GraphNode gnsatisfy=new GraphNode("SatisfyRule"+i,tnsatisfy);
-	    ConsequenceNode cnsatisfy=new ConsequenceNode();
-	    TermNode ctnsatisfy=new TermNode(cnsatisfy);
-	    GraphNode cgnsatisfy=new GraphNode("ConseqSatisfyRule"+i,ctnsatisfy);
-	    consequence.put(satisfy,cgnsatisfy);
-	    GraphNode.Edge esat=new GraphNode.Edge("consequencesatisfy"+i,cgnsatisfy);
-	    gnsatisfy.addEdge(esat);
-	    consequencenodes.add(cgnsatisfy);
-	    scopesatisfy.put(r,gnsatisfy);
-	    scopenodes.add(gnsatisfy);
+    public boolean analyzeQuantifiers(Quantifiers qs,Set set) {
+	for(int i=0;i<qs.numQuantifiers();i++) {
+	    Quantifier q=qs.getQuantifier(i);
+	    if (set.contains(q))
+		continue;
+	    if (q instanceof SetQuantifier) {
+		SetDescriptor sd=((SetQuantifier)q).getSet();
+		if (maxsize.getsize(sd)<=1&&
+		    maxsize.getsize(sd)>=0)
+		    continue;
+	    } else if (q instanceof RelationQuantifier) {
+		RelationDescriptor rd=((RelationQuantifier)q).getRelation();
+		if (maxsize.getsize(rd)<=1&&
+		    maxsize.getsize(rd)>=0)
+		    continue;
+	    }
+	    return false;
+	}
+	return true;
+    }
 
-	    ScopeNode falsify=new ScopeNode(r,false);
-	    TermNode tnfalsify=new TermNode(falsify);
-	    GraphNode gnfalsify=new GraphNode("FalsifyRule"+i,tnfalsify);
-	    ConsequenceNode cnfalsify=new ConsequenceNode();
-	    TermNode ctnfalsify=new TermNode(cnfalsify);
-	    GraphNode cgnfalsify=new GraphNode("ConseqFalsifyRule"+i,ctnfalsify);
-	    consequence.put(falsify,cgnfalsify);
-	    GraphNode.Edge efals=new GraphNode.Edge("consequencefalsify"+i,cgnfalsify);
-	    gnfalsify.addEdge(efals);
-	    consequencenodes.add(cgnfalsify);
-	    scopefalsify.put(r,gnfalsify);
-	    scopenodes.add(gnfalsify);
+    public boolean mutuallyexclusive(SetDescriptor sd1, SetDescriptor sd2) {
+	if (mutualexclusive(sd1,sd2)||
+	    mutualexclusive(sd2,sd1))
+	    return true;
+	else
+	    return false;
+    }
+
+    private boolean mutualexclusive(SetDescriptor sd1, SetDescriptor sd2) {
+	Vector rules=state.vRules;
+	for(int i=0;i<rules.size();i++) {
+	    Rule r=(Rule)rules.get(i);
+	    if (r.getInclusion().getTargetDescriptors().contains(sd1)) {
+		/* Rule may add items to sd1 */
+		SetInclusion si=(SetInclusion)r.getInclusion();
+		Expr ve=si.getExpr();
+		DNFRule drule=r.getDNFGuardExpr();
+		for(int j=0;j<drule.size();j++) {
+		    RuleConjunction rconj=drule.get(j);
+		    boolean containsexclusion=false;
+		    for (int k=0;k<rconj.size();k++) {
+			DNFExpr dexpr=rconj.get(k);
+			if (dexpr.getNegation()&&
+			    dexpr.getExpr() instanceof ElementOfExpr&&
+			    ((ElementOfExpr)dexpr.getExpr()).element.equals(null,ve)) {
+			    SetDescriptor sd=((ElementOfExpr)dexpr.getExpr()).set;
+			    if (sd.isSubset(sd2))
+				containsexclusion=true;
+			}
+		    }
+		    if (!containsexclusion)
+			return false;
+		}
+	    }
 	}
+	return true;
     }
 }