X-Git-Url: http://plrg.eecs.uci.edu/git/?p=repair.git;a=blobdiff_plain;f=Repair%2FRepairCompiler%2FMCC%2FIR%2FTermination.java;h=0d074f6a3146bdfeeb19e50c5852878ff4198d2d;hp=0a0859c18b0a787fe8f43b39f538f9fbe8dc0785;hb=23ac0c09ffe5d225de83ca4195ae5448434b0a71;hpb=54597fb35ad6948a03dddb1744c32c4e3648244b

diff --git a/Repair/RepairCompiler/MCC/IR/Termination.java b/Repair/RepairCompiler/MCC/IR/Termination.java
index 0a0859c..0d074f6 100755
--- a/Repair/RepairCompiler/MCC/IR/Termination.java
+++ b/Repair/RepairCompiler/MCC/IR/Termination.java
@@ -73,20 +73,20 @@ public class Termination {
 	generateconjunctionnodes();
 	constraintdependence=new ConstraintDependence(state,this);
 
-        debugmsg("Generating scope nodes");
+        debugmsg("*****Generating scope nodes*****");
 	generatescopenodes();
-        debugmsg("Generating repair nodes");
+        debugmsg("*****Generating repair nodes*****");
 	generaterepairnodes();
-        debugmsg("Generating data structure nodes");
+        debugmsg("*****Generating data structure nodes*****");
 	generatedatastructureupdatenodes();
-        debugmsg("Generating compensation nodes");
+        debugmsg("*****Generating compensation nodes*****");
 	if (!Compiler.OMITCOMP)
 	    generatecompensationnodes();
-        debugmsg("Generating abstract edges");
+        debugmsg("*****Generating abstract edges*****");
 	generateabstractedges();
-        debugmsg("Generating scope edges");
+        debugmsg("*****Generating scope edges*****");
 	generatescopeedges();
-        debugmsg("Generating update edges");
+        debugmsg("*****Generating update edges*****");
 	generateupdateedges();
 
 
@@ -243,22 +243,22 @@ public class Termination {
 			    TupleOfExpr toe=(TupleOfExpr)e;
 			    if (negated) {
 				GraphNode agn=(GraphNode)abstractremove.get(toe.relation);
-				GraphNode.Edge edge=new GraphNode.Edge("requires",agn);
+				GraphNode.Edge edge=new GraphNode.Edge("requirestupleremove",agn);
 				gn.addEdge(edge);
 			    } else {
 				GraphNode agn=(GraphNode)abstractadd.get(toe.relation);
-				GraphNode.Edge edge=new GraphNode.Edge("requires",agn);
+				GraphNode.Edge edge=new GraphNode.Edge("requirestupleadd",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);
+				GraphNode.Edge edge=new GraphNode.Edge("requireselementremove",agn);
 				gn.addEdge(edge);
 			    } else {
 				GraphNode agn=(GraphNode)abstractadd.get(eoe.set);
-				GraphNode.Edge edge=new GraphNode.Edge("requires",agn);
+				GraphNode.Edge edge=new GraphNode.Edge("requireselementadd",agn);
 				gn.addEdge(edge);
 			    }
 			} else throw new Error("Unrecognized Abstract Update");
@@ -268,14 +268,20 @@ public class Termination {
 	    /* 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 (Compiler.DEBUGGRAPH) {
+                    System.out.println(gn.getLabel()+"--->"+((GraphNode)scopesatisfy.get(r)).getLabel());
+                }
 		if (concreteinterferes.interferes(mun,r,true)) {
 		    GraphNode scopenode=(GraphNode)scopesatisfy.get(r);
-		    GraphNode.Edge e=new GraphNode.Edge("interferes",scopenode);
+		    GraphNode.Edge e=new GraphNode.Edge("satisfyscopeinterferes",scopenode);
 		    gn.addEdge(e);
 		}
+                if (Compiler.DEBUGGRAPH) {
+                    System.out.println(gn.getLabel()+"--->"+((GraphNode)scopefalsify.get(r)).getLabel());
+                }
 		if (concreteinterferes.interferes(mun,r,false)) {
 		    GraphNode scopenode=(GraphNode)scopefalsify.get(r);
-		    GraphNode.Edge e=new GraphNode.Edge("interferes",scopenode);
+		    GraphNode.Edge e=new GraphNode.Edge("falsifyscopeinterferes",scopenode);
 		    gn.addEdge(e);
 		}
 	    }
@@ -298,7 +304,7 @@ public class Termination {
 		if (abstractinterferes.checkrelationconstraint(ar, cons))
 		    continue;
                 if (AbstractInterferes.interferesquantifier(ar,cons)) {
-                    GraphNode.Edge e=new GraphNode.Edge("interferes",gn2);
+                    GraphNode.Edge e=new GraphNode.Edge("interferesquantifier",gn2);
                     gn.addEdge(e);
                 } else {
                     for(int i=0;i<conj.size();i++) {
@@ -308,7 +314,7 @@ public class Termination {
                             continue;
                         if (getConstraint(gn)==null||
                             !abstractinterferes.interferemodifies(ar,getConstraint(gn),dp,cons)) {
-                            GraphNode.Edge e=new GraphNode.Edge("interferes",gn2);
+                            GraphNode.Edge e=new GraphNode.Edge("interferesmodify",gn2);
                             gn.addEdge(e);
                             break;
                         }
@@ -320,7 +326,7 @@ public class Termination {
 		TermNode tn2=(TermNode)gn2.getOwner();
 		ScopeNode sn2=tn2.getScope();
 		if (AbstractInterferes.interfereswithrule(ar,sn2.getRule(),sn2.getSatisfy())) {
-		    GraphNode.Edge e=new GraphNode.Edge("interferes",gn2);
+		    GraphNode.Edge e=new GraphNode.Edge("interfereswithrule",gn2);
 		    gn.addEdge(e);
 		}
 	    }
@@ -394,7 +400,7 @@ public class Termination {
 		    DNFPredicate dp=conj.get(i);
 		    if (abstractinterferes.scopeinterfereswithpredicate(sn,dp)||
 			AbstractInterferes.interfereswithquantifier(sn.getDescriptor(),sn.getSatisfy(),constr)) {
-			GraphNode.Edge e=new GraphNode.Edge("interferes",gn2);
+			GraphNode.Edge e=new GraphNode.Edge("interferesconjunction",gn2);
 			GraphNode gnconseq=(GraphNode)consequence.get(sn);
 			gnconseq.addEdge(e);
 			break;
@@ -407,13 +413,13 @@ public class Termination {
 		Rule r=(Rule) state.vRules.get(i);
 		if (AbstractInterferes.interfereswithrule(sn.getDescriptor(),sn.getSatisfy(),r,true)) {
 		    GraphNode scopenode=(GraphNode)scopesatisfy.get(r);
-		    GraphNode.Edge e=new GraphNode.Edge("interferes",scopenode);
+		    GraphNode.Edge e=new GraphNode.Edge("interferesscopesatisfy2",scopenode);
 		    GraphNode gnconseq=(GraphNode)consequence.get(sn);
 		    gnconseq.addEdge(e);
 		}
 		if (AbstractInterferes.interfereswithrule(sn.getDescriptor(),sn.getSatisfy(),r,false)) {
 		    GraphNode scopenode=(GraphNode)scopefalsify.get(r);
-		    GraphNode.Edge e=new GraphNode.Edge("interferes",scopenode);
+		    GraphNode.Edge e=new GraphNode.Edge("interferesscopefalsify2",scopenode);
 		    GraphNode gnconseq=(GraphNode)consequence.get(sn);
 		    gnconseq.addEdge(e);
 		}
@@ -458,12 +464,40 @@ public class Termination {
 		}
 
 		for(int j=0;j<array.length;j++) {
+                    if (array[j]==AbstractRepair.ADDTOSET) {
+
+                        System.out.println("1");
+                        if ((dp.getPredicate() instanceof ExprPredicate)&&
+                            (((ExprPredicate)dp.getPredicate()).getType()==ExprPredicate.SIZE)) {
+                            System.out.println("2");
+                            boolean neg=dp.isNegated();
+                            Opcode op=((ExprPredicate)dp.getPredicate()).getOp();
+                            int size=((ExprPredicate)dp.getPredicate()).rightSize();
+                            op=Opcode.translateOpcode(neg,op);
+                            Descriptor des=((ExprPredicate)dp.getPredicate()).getDescriptor();
+                            if (des instanceof SetDescriptor) {
+                                System.out.println("3");
+
+                                int minsize=exactsize.minSize((SetDescriptor)des);
+                                Constraint reqc=exactsize.ensuresMinSize((SetDescriptor)des);
+                                if (((size==minsize)&&(op==Opcode.EQ))||
+                                    ((size<=minsize)&&(op==Opcode.GE))||
+                                    ((size<minsize)&&(op==Opcode.GT))) {
+                                    System.out.println("4");
+                                    constraintdependence.requiresConstraint(gn,reqc);
+                                    //force good ordering
+                                    continue; //no repair action needed here...
+                                }
+                            }
+                        }
+                    }
+
 		    AbstractRepair ar=new AbstractRepair(dp,array[j],d,sources);
 		    TermNode tn2=new TermNode(ar);
 		    //		    GraphNode gn2=new GraphNode(gn.getLabel()+"A"+i+"B"+ar.type(),gn.getTextLabel()+" #"+i+" "+ar.type(),tn2);
 		    GraphNode gn2=new GraphNode(gn.getLabel()+"A"+i+"B"+ar.type(),dp.name()+" "+ar.type(),tn2);
 		    gn2.setOption(absrepoption);
-		    GraphNode.Edge e=new GraphNode.Edge("abstract",gn2);
+		    GraphNode.Edge e=new GraphNode.Edge("abstractedge1",gn2);
 		    gn.addEdge(e);
 		    if (!predtoabstractmap.containsKey(dp))
 			predtoabstractmap.put(dp,new HashSet());
@@ -565,7 +599,7 @@ public class Termination {
 			un.addUpdate(u);
 			if (abstractremove.containsKey(rq.relation)) {
 			    GraphNode agn=(GraphNode)abstractremove.get(rq.relation);
-			    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
+			    GraphNode.Edge e=new GraphNode.Edge("requiresremove1",agn);
 			    gn2.addEdge(e);
 			} else {
 			    continue; /* Abstract repair doesn't exist */
@@ -578,7 +612,7 @@ public class Termination {
 			un.addUpdate(u);
 			if (abstractremove.containsKey(sq.set)) {
 			    GraphNode agn=(GraphNode)abstractremove.get(sq.set);
-			    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
+			    GraphNode.Edge e=new GraphNode.Edge("requiresremove2",agn);
 			    gn2.addEdge(e);
 			} else {
 			    continue; /* Abstract repair doesn't exist */
@@ -597,7 +631,7 @@ public class Termination {
 		    continue;
 
 		mun.addUpdate(un);
-		GraphNode.Edge e=new GraphNode.Edge("abstract"+compensationcount,gn2);
+		GraphNode.Edge e=new GraphNode.Edge("abstractcomp"+compensationcount,gn2);
 		compensationcount++;
 		gn.addEdge(e);
 		updatenodes.add(gn2);
@@ -675,7 +709,7 @@ public class Termination {
 			un.addUpdate(u);
 			if (abstractremove.containsKey(rq.relation)) {
 			    GraphNode agn=(GraphNode)abstractremove.get(rq.relation);
-			    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
+			    GraphNode.Edge e=new GraphNode.Edge("requiresremove3",agn);
 			    gn2.addEdge(e);
 			} else {
 			    goodflag=false;break; /* Abstract repair doesn't exist */
@@ -688,7 +722,7 @@ public class Termination {
 			un.addUpdate(u);
 			if (abstractremove.containsKey(sq.set)) {
 			    GraphNode agn=(GraphNode)abstractremove.get(sq.set);
-			    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
+			    GraphNode.Edge e=new GraphNode.Edge("requiresremove4",agn);
 			    gn2.addEdge(e);
 			} else {
 			    goodflag=false;break; /* Abstract repair doesn't exist */
@@ -707,7 +741,7 @@ public class Termination {
 		mun.addUpdate(un);
 	    }
 	    if (goodflag) {
-		GraphNode.Edge e=new GraphNode.Edge("abstract"+(removefromcount++),gn2);
+		GraphNode.Edge e=new GraphNode.Edge("abstract3"+(removefromcount++),gn2);
 		gn.addEdge(e);
 		updatenodes.add(gn2);
 	    }
@@ -828,7 +862,7 @@ public class Termination {
 		mun.addUpdate(un);
 	    }
 	    if (goodflag) {
-		GraphNode.Edge e=new GraphNode.Edge("abstract"+modifycount,gn2);
+		GraphNode.Edge e=new GraphNode.Edge("abstract4"+modifycount,gn2);
 		modifycount++;
 		gn.addEdge(e);
 		updatenodes.add(gn2);
@@ -1012,7 +1046,7 @@ public class Termination {
 			un.checkupdates()&&
 			debugmsg("Updates checked")) {
 			mun.addUpdate(un);
-			GraphNode.Edge e=new GraphNode.Edge("abstract"+addtocount,gn2);
+			GraphNode.Edge e=new GraphNode.Edge("abstract5"+addtocount,gn2);
 			addtocount++;
 			gn.addEdge(e);
 			updatenodes.add(gn2);
@@ -1266,7 +1300,7 @@ public class Termination {
 		un.addUpdate(u);
 		if (abstractadd.containsKey(rq.relation)) {
 		    GraphNode agn=(GraphNode)abstractadd.get(rq.relation);
-		    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
+		    GraphNode.Edge e=new GraphNode.Edge("requiresadd5",agn);
 		    gn.addEdge(e);
 		} else {
 		    return false;
@@ -1290,7 +1324,7 @@ public class Termination {
 		un.addUpdate(u);
 		if (abstractadd.containsKey(sq.set)) {
 		    GraphNode agn=(GraphNode)abstractadd.get(sq.set);
-		    GraphNode.Edge e=new GraphNode.Edge("requires",agn);
+		    GraphNode.Edge e=new GraphNode.Edge("requiresadd6",agn);
 		    gn.addEdge(e);
 		} else {
 		    return false;