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();
Constraint c=(Constraint)constraints.get(i);
DNFConstraint dnf=c.dnfconstraint;
for(int j=0;j<dnf.size();j++) {
+ if (Compiler.removeconj.contains(new String(i+","+j)))
+ continue;
+
TermNode tn=new TermNode(c,dnf.get(j));
GraphNode gn=new GraphNode("Conj"+i+"A"+j,
"Conj ("+i+","+j+") "+dnf.get(j).name()
}
// Construct quantifier "conjunction" nodes
for(int j=0;j<c.numQuantifiers();j++) {
+ if (Compiler.removeconj.contains(new String(i+","+(j+constraints.size()))))
+ continue;
Quantifier q=c.getQuantifier(j);
if (q instanceof SetQuantifier) {
SetQuantifier sq=(SetQuantifier)q;
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()
+ GraphNode gn=new GraphNode("Conj"+i+"AQ"+(j+constraints.size()),
+ "Conj ("+i+","+(j+constraints.size())+") "+dconst.get(0).name()
,tn);
gn.setOption(conjoption);
conjunctions.add(gn);
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()
+ GraphNode gn=new GraphNode("Conj"+i+"AQ"+(j+constraints.size()),
+ "Conj ("+i+","+(j+constraints.size())+") "+dconst.get(0).name()
,tn);
gn.setOption(conjoption);
conjunctions.add(gn);
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");
/* 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);
}
}
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++) {
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;
}
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);
}
}
TermNode tnsatisfy=new TermNode(satisfy);
GraphNode gnsatisfy=new GraphNode("SatisfyRule"+i,tnsatisfy);
gnsatisfy.setOption(scopeoption);
- gnsatisfy.setMerge();
+ if (Compiler.MERGENODES)
+ gnsatisfy.setMerge();
ConsequenceNode cnsatisfy=new ConsequenceNode();
TermNode ctnsatisfy=new TermNode(cnsatisfy);
GraphNode cgnsatisfy=new GraphNode("ConseqSatisfyRule"+i,ctnsatisfy);
TermNode tnfalsify=new TermNode(falsify);
GraphNode gnfalsify=new GraphNode("FalsifyRule"+i,tnfalsify);
gnfalsify.setOption(scopeoption);
- gnfalsify.setMerge();
+ if (Compiler.MERGENODES)
+ gnfalsify.setMerge();
ConsequenceNode cnfalsify=new ConsequenceNode();
TermNode ctnfalsify=new TermNode(cnfalsify);
GraphNode cgnfalsify=new GraphNode("ConseqFalsifyRule"+i,ctnfalsify);
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;
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);
}
}
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());
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 */
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 */
continue;
}
}
- if (!un.checkupdates()) /* Make sure we have a good update */
+ if (!un.checkupdates(state)) /* Make sure we have a good update */
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);
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 */
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 */
goodflag=false;break;
}
}
- if (!un.checkupdates()) {
+ if (!un.checkupdates(state)) {
goodflag=false;
break;
}
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);
}
goodflag=false;
}
- if (!un.checkupdates()) {
+ if (!un.checkupdates(state)) {
goodflag=false;
break;
}
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);
continue endloop;
e=ce.getExpr();
}
-
if (!(e instanceof VarExpr)) {
if (e.isValue(si.getSet().getType())) {
Updates up=new Updates(e,0,si.getSet().getType());
debugmsg("Finished processing quantifiers")&&
processconjunction(un,ruleconj,setmapping)&&
debugmsg("Finished processing conjunction")&&
- un.checkupdates()&&
+ un.checkupdates(state)&&
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);
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;
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;