import java.util.Map;
import java.util.Set;
+import IR.ClassDescriptor;
import IR.Descriptor;
import IR.MethodDescriptor;
import IR.NameDescriptor;
private Map<HNode, TripleItem> mapSharedNodeToTripleItem;
private Map<HNode, Integer> mapHNodeToHighestIndex;
+ private Map<Descriptor, Map<TripleItem, String>> mapDescToIntermediateLocMap;
+
+ private Map<Pair<HNode, HNode>, Integer> mapItemToHighestIndex;
+
+ private Map<SSJavaLattice<String>, Set<String>> mapLatticeToLocalLocSet;
+
public BuildLattice(LocationInference infer) {
this.infer = infer;
this.mapSharedNodeToTripleItem = new HashMap<HNode, TripleItem>();
this.mapHNodeToHighestIndex = new HashMap<HNode, Integer>();
+ this.mapItemToHighestIndex = new HashMap<Pair<HNode, HNode>, Integer>();
+ this.mapDescToIntermediateLocMap = new HashMap<Descriptor, Map<TripleItem, String>>();
+ this.mapLatticeToLocalLocSet = new HashMap<SSJavaLattice<String>, Set<String>>();
}
public SSJavaLattice<String> buildLattice(Descriptor desc) {
HierarchyGraph inputGraph = infer.getSkeletonCombinationHierarchyGraph(desc);
LocationSummary locSummary = infer.getLocationSummary(desc);
+ HierarchyGraph naiveGraph = infer.getSimpleHierarchyGraph(desc);
+
+ // I don't think we need to keep the below if statement anymore
+ // because hierarchy graph does not have any composite location
Set<HNode> nodeSetWithCompositeLocation = new HashSet<HNode>();
if (desc instanceof MethodDescriptor) {
FlowGraph flowGraph = infer.getFlowGraph((MethodDescriptor) desc);
}
+ // /////////////////////////////////////////////////////////////////////////////////////
+ // lattice generation for the native approach
+
+ if (infer.state.SSJAVA_INFER_NAIVE_WRITEDOTS) {
+ BasisSet naiveBasisSet = naiveGraph.computeBasisSet(nodeSetWithCompositeLocation);
+
+ Family naiveFamily = generateFamily(naiveBasisSet);
+ Map<Set<Integer>, Set<Set<Integer>>> naive_mapImSucc =
+ coveringGraph(naiveBasisSet, naiveFamily);
+
+ SSJavaLattice<String> naive_lattice =
+ buildLattice(desc, naiveBasisSet, naiveGraph, null, naive_mapImSucc);
+ LocationInference.numLocationsNaive += naive_lattice.getKeySet().size();
+ infer.addNaiveLattice(desc, naive_lattice);
+ }
+
+ // /////////////////////////////////////////////////////////////////////////////////////
+
+ // lattice generation for the proposed approach
BasisSet basisSet = inputGraph.computeBasisSet(nodeSetWithCompositeLocation);
- debug_print(inputGraph);
+ // debug_print(inputGraph);
Family family = generateFamily(basisSet);
Map<Set<Integer>, Set<Set<Integer>>> mapImSucc = coveringGraph(basisSet, family);
}
+ public void setIntermediateLocMap(Descriptor desc, Map<TripleItem, String> map) {
+ mapDescToIntermediateLocMap.put(desc, map);
+ }
+
+ public Map<TripleItem, String> getIntermediateLocMap(Descriptor desc) {
+ if (!mapDescToIntermediateLocMap.containsKey(desc)) {
+ mapDescToIntermediateLocMap.put(desc, new HashMap<TripleItem, String>());
+ }
+ return mapDescToIntermediateLocMap.get(desc);
+ }
+
+ private Descriptor getParent(Descriptor desc) {
+ if (desc instanceof MethodDescriptor) {
+ MethodDescriptor md = (MethodDescriptor) desc;
+ ClassDescriptor cd = md.getClassDesc();
+ return infer.getParentMethodDesc(cd, md);
+ } else {
+ return ((ClassDescriptor) desc).getSuperDesc();
+ }
+ }
+
private SSJavaLattice<String> buildLattice(Descriptor desc, BasisSet basisSet,
HierarchyGraph inputGraph, LocationSummary locSummary,
Map<Set<Integer>, Set<Set<Integer>>> mapImSucc) {
+ System.out.println("\nBuild Lattice:" + inputGraph.getName());
+
SSJavaLattice<String> lattice =
new SSJavaLattice<String>(SSJavaAnalysis.TOP, SSJavaAnalysis.BOTTOM);
Set<Descriptor> descSet = inputGraph.getDescSetOfNode(higherNode);
// System.out.println("higherName=" + higherName + " higherNode=" + higherNode + " descSet="
// + descSet);
- for (Iterator iterator2 = descSet.iterator(); iterator2.hasNext();) {
- Descriptor d = (Descriptor) iterator2.next();
- locSummary.addMapHNodeNameToLocationName(d.getSymbol(), higherName);
+
+ if (locSummary != null) {
+ for (Iterator iterator2 = descSet.iterator(); iterator2.hasNext();) {
+ Descriptor d = (Descriptor) iterator2.next();
+ locSummary.addMapHNodeNameToLocationName(d.getSymbol(), higherName);
+ }
}
+
// locSummary.addMapHNodeNameToLocationName(higherName, higherName);
Set<Set<Integer>> lowerSet = mapImSucc.get(higher);
Set<Descriptor> lowerDescSet = inputGraph.getDescSetOfNode(lowerNode);
// System.out.println("lowerName=" + lowerName + " lowerNode=" + lowerNode + " descSet="
// + lowerDescSet);
- for (Iterator iterator3 = lowerDescSet.iterator(); iterator3.hasNext();) {
- Descriptor d = (Descriptor) iterator3.next();
- locSummary.addMapHNodeNameToLocationName(d.getSymbol(), lowerName);
+ if (locSummary != null) {
+ for (Iterator iterator3 = lowerDescSet.iterator(); iterator3.hasNext();) {
+ Descriptor d = (Descriptor) iterator3.next();
+ locSummary.addMapHNodeNameToLocationName(d.getSymbol(), lowerName);
+ }
}
// locSummary.addMapHNodeNameToLocationName(lowerName, lowerName);
public SSJavaLattice<String> insertIntermediateNodesToStraightLine(Descriptor desc,
SSJavaLattice<String> skeletonLattice) {
+ SSJavaLattice<String> lattice = skeletonLattice.clone();
+ LocationSummary locSummary = infer.getLocationSummary(desc);
+
+ Descriptor parentDesc = getParent(desc);
+ if (parentDesc != null) {
+ SSJavaLattice<String> parentLattice = infer.getLattice(parentDesc);
+
+ Map<String, Set<String>> parentMap = parentLattice.getTable();
+ Set<String> parentKeySet = parentMap.keySet();
+ for (Iterator iterator = parentKeySet.iterator(); iterator.hasNext();) {
+ String parentKey = (String) iterator.next();
+ Set<String> parentValueSet = parentMap.get(parentKey);
+ for (Iterator iterator2 = parentValueSet.iterator(); iterator2.hasNext();) {
+ String value = (String) iterator2.next();
+ lattice.put(parentKey, value);
+ }
+ }
+
+ Set<String> parentSharedLocSet = parentLattice.getSharedLocSet();
+ for (Iterator iterator = parentSharedLocSet.iterator(); iterator.hasNext();) {
+ String parentSharedLoc = (String) iterator.next();
+ lattice.addSharedLoc(parentSharedLoc);
+ }
+ }
+
+ HierarchyGraph hierarchyGraph = infer.getSimpleHierarchyGraph(desc);
+ HierarchyGraph scGraph = infer.getSkeletonCombinationHierarchyGraph(desc);
+
+ Set<HNode> hierarchyGraphNodeSet = hierarchyGraph.getNodeSet();
+ for (Iterator iterator = hierarchyGraphNodeSet.iterator(); iterator.hasNext();) {
+ HNode hNode = (HNode) iterator.next();
+ if (!hNode.isSkeleton()) {
+ // here we need to insert an intermediate node for the hNode
+ System.out.println("\n#local node=" + hNode);
+
+ // 1) find the lowest node m in the lattice that is above hnode in the lattice
+ // 2) count the number of non-shared nodes d between the hnode and the node m
+ // int numNonSharedNodes;
+ int dist;
+
+ HNode SCNode;
+ if (hNode.isDirectCombinationNode()) {
+ // this node itself is the lowest node m. it is the first node of the chain
+ Set<HNode> combineSet = hierarchyGraph.getCombineSetByCombinationNode(hNode);
+
+ System.out.println(" # direct combine node::combineSkeletonNodeSet=" + combineSet);
+
+ SCNode = scGraph.getCombinationNode(combineSet);
+ // numNonSharedNodes = -1;
+ dist = 0;
+ } else {
+
+ Set<HNode> aboveSet = new HashSet<HNode>();
+ if (hNode.isCombinationNode()) {
+ // the current node is a combination node
+ Set<HNode> combineSkeletonNodeSet =
+ hierarchyGraph.getCombineSetByCombinationNode(hNode);
+ System.out.println(" combineSkeletonNodeSet=" + combineSkeletonNodeSet
+ + " combinationNode=" + scGraph.getCombinationNode(combineSkeletonNodeSet));
+
+ scGraph.getCombinationNode(combineSkeletonNodeSet);
+
+ System.out.println(" firstnodeOfSimpleGraph="
+ + hierarchyGraph.getFirstNodeOfCombinationNodeChainSet(combineSkeletonNodeSet));
+ aboveSet.addAll(hierarchyGraph
+ .getFirstNodeOfCombinationNodeChainSet(combineSkeletonNodeSet));
+
+ SCNode = scGraph.getCombinationNode(combineSkeletonNodeSet);
+
+ } else {
+ // the current node is not a combination node
+ // there is only one parent node which should be skeleton node.
+
+ System.out.println(" hierarchyGraph.getSkeleteNodeSetReachTo(" + hNode + ")="
+ + hierarchyGraph.getSkeleteNodeSetReachTo(hNode));
+ aboveSet.addAll(hierarchyGraph.getSkeleteNodeSetReachTo(hNode));
+ System.out.println(" aboveset of " + hNode + "=" + aboveSet);
+ // assert aboveSet.size() == 1;
+ SCNode = aboveSet.iterator().next();
+ }
+
+ // update above set w.r.t the hierarchy graph with SC nodes
+ // because the skeleton nodes in the origianl hierarchy graph may merged to a new node
+ Set<HNode> endSet = new HashSet<HNode>();
+ for (Iterator iterator2 = aboveSet.iterator(); iterator2.hasNext();) {
+ HNode aboveNode = (HNode) iterator2.next();
+ endSet.add(scGraph.getCurrentHNode(aboveNode));
+ }
+ dist = hierarchyGraph.computeDistance(hNode, endSet);
+ System.out.println("##### " + hNode + "::dist=" + dist);
+
+ // numNonSharedNodes = hierarchyGraph.countNonSharedNode(hNode, endSet);
+
+ System.out.println(" COUNT-RESULT::node=" + hNode + " above=" + endSet + " distance="
+ + dist + " SCNode=" + SCNode);
+ }
+
+ // 3) convert the node m into a chain of nodes with the last node in the chain having m’s
+ // outgoing edges.
+ Set<HNode> outgoingSCNodeSet = scGraph.getOutgoingNodeSet(SCNode);
+ System.out.println(" outgoing scnode set from " + SCNode + "=" + outgoingSCNodeSet);
+
+ // convert hnodes to location names
+ String startLocName = locSummary.getLocationName(SCNode.getName());
+ Set<String> outgoingLocNameSet = new HashSet<String>();
+ for (Iterator iterator2 = outgoingSCNodeSet.iterator(); iterator2.hasNext();) {
+ HNode outSCNode = (HNode) iterator2.next();
+ String locName = locSummary.getLocationName(outSCNode.getName());
+ if (!locName.equals(outSCNode.getName())) {
+ System.out.println(" outSCNode=" + outSCNode + " -> locName="
+ + locName);
+ }
+ outgoingLocNameSet.add(locName);
+ }
+
+ if (outgoingLocNameSet.isEmpty()) {
+ outgoingLocNameSet.add(lattice.getBottomItem());
+ }
+
+ // 4) If hnode is not a shared location, check if there already exists a local variable
+ // node that has distance d below m along this chain. If such a node
+ // does not exist, insert it.
+ String locName =
+ getNewLocation(lattice, startLocName, outgoingLocNameSet, dist, hNode.isSharedNode());
+ System.out.println(" ###hNode=" + hNode + "---->locName=" + locName);
+ locSummary.addMapHNodeNameToLocationName(hNode.getName(), locName);
+
+ }
+ }
+
+ return lattice;
+ }
+
+ private void addLocalLocation(SSJavaLattice<String> lattice, String localLoc) {
+ if (!mapLatticeToLocalLocSet.containsKey(lattice)) {
+ mapLatticeToLocalLocSet.put(lattice, new HashSet<String>());
+ }
+ mapLatticeToLocalLocSet.get(lattice).add(localLoc);
+ }
+
+ private boolean isLocalLocation(SSJavaLattice<String> lattice, String localLoc) {
+ if (mapLatticeToLocalLocSet.containsKey(lattice)) {
+ return mapLatticeToLocalLocSet.get(lattice).contains(localLoc);
+ }
+ return false;
+ }
+
+ public String getNewLocation(SSJavaLattice<String> lattice, String start, Set<String> endSet,
+ int dist, boolean isShared) {
+ System.out.println(" #GETNEWLOCATION:: start=" + start + " endSet=" + endSet + " dist="
+ + dist + " isShared=" + isShared);
+ // if (dist == -1) {
+ // if (isShared) {
+ // // if the node is a shared one, check if the next node is shared
+ // // if not, need to insert a new shared node
+ // return recur_getNewLocation(lattice, start, endSet, dist + 1, isShared);
+ // } else {
+ // return start;
+ // }
+ //
+ // }
+ return recur_getNewLocation(lattice, start, start, endSet, dist, isShared);
+ }
+
+ private String recur_getNewLocation(SSJavaLattice<String> lattice, String start, String cur,
+ Set<String> endSet, int dist, boolean isShared) {
+
+ System.out.println(" recur_getNewLocation cur=" + cur + " dist=" + dist);
+
+ if (dist == 0) {
+ if (isShared) {
+ // first check if there already exists a non-shared node at distance d
+ if (!isLocalLocation(lattice, cur) && !start.equals(cur)) {
+ // if not, need to insert a new local location at this point
+ System.out.println("if not, need to insert a new local location at this point");
+ String newLocName = "ILOC" + (LocationInference.locSeed++);
+ Set<String> lowerSet = new HashSet<String>();
+ lowerSet.addAll(lattice.get(cur));
+ lattice.insertNewLocationBetween(cur, lowerSet, newLocName);
+ addLocalLocation(lattice, newLocName);
+
+ // assign the new local location to cur
+ cur = newLocName;
+ }
+
+ Set<String> connectedSet = lattice.get(cur);
+ if (connectedSet == null) {
+ connectedSet = new HashSet<String>();
+ }
+ System.out.println("cur=" + cur + " connectedSet=" + connectedSet);
+
+ // check if there already exists a shared node that has distance d + 1 on the chain
+ boolean needToInsertSharedNode = false;
+ if (connectedSet.equals(endSet)) {
+ needToInsertSharedNode = true;
+ } else {
+ // in this case, the current node is in the middle of the chain
+ assert connectedSet.size() == 1;
+ String below = connectedSet.iterator().next();
+ if (lattice.isSharedLoc(below)) {
+ return below;
+ } else {
+ needToInsertSharedNode = true;
+ }
+ }
+
+ if (needToInsertSharedNode) {
+ // no shared local location at d+1, need to insert it!
+ String newSharedLocName = "ILOC" + (LocationInference.locSeed++);
+ Set<String> lowerSet = new HashSet<String>();
+ lowerSet.addAll(connectedSet);
+ lattice.insertNewLocationBetween(cur, lowerSet, newSharedLocName);
+ lattice.addSharedLoc(newSharedLocName);
+ addLocalLocation(lattice, newSharedLocName);
+ System.out.println(" INSERT NEW SHARED LOC=" + newSharedLocName);
+ cur = newSharedLocName;
+ }
+
+ return cur;
+
+ } else {
+
+ return cur;
+ // if the node is not shared, check if a node at distance d is a local or combination node
+ // Set<String> connectedSet = lattice.get(cur);
+ // if (connectedSet == null) {
+ // connectedSet = new HashSet<String>();
+ // }
+ // System.out
+ // .println("if the node is not shared, check if a node at distance d is a local or combination node connectedSet="
+ // + connectedSet);
+ // // if (!start.equals(cur) && (cur.equals(lattice.getTopItem()) ||
+ // connectedSet.equals(endSet))) {
+ // // if not, need to insert a new local location at this point
+ // System.out.println("NEED TO INSERT A NEW LOCAL LOC connectedSet=" + connectedSet);
+ // String newLocName = "ILOC" + (LocationInference.locSeed++);
+ // Set<String> lowerSet = new HashSet<String>();
+ // lowerSet.addAll(connectedSet);
+ // lattice.insertNewLocationBetween(cur, lowerSet, newLocName);
+ // addLocalLocation(lattice, newLocName);
+ // return newLocName;
+ // } else {
+ // return cur;
+ // }
+ }
+ }
+
+ Set<String> connectedSet = lattice.get(cur);
+ if (connectedSet == null) {
+ connectedSet = new HashSet<String>();
+ }
+
+ System.out.println("cur=" + cur + " connected set=" + connectedSet);
+ if (cur.equals(lattice.getTopItem()) || connectedSet.equals(endSet)) {
+ // if not, need to insert a new local location at this point
+ System.out.println("NEED TO INSERT A NEW LOCAL LOC FOR NEXT connectedSet=" + connectedSet);
+ String newLocName = "ILOC" + (LocationInference.locSeed++);
+ Set<String> lowerSet = new HashSet<String>();
+ lowerSet.addAll(connectedSet);
+ lattice.insertNewLocationBetween(cur, lowerSet, newLocName);
+ addLocalLocation(lattice, newLocName);
+ cur = newLocName;
+ } else {
+ // in this case, the current node is in the middle of the chain
+ assert connectedSet.size() == 1;
+ cur = connectedSet.iterator().next();
+ }
+
+ if (!lattice.isSharedLoc(cur)) {
+ dist--;
+ }
+ return recur_getNewLocation(lattice, start, cur, endSet, dist, isShared);
+
+ }
+
+ public String getNewLocation2(SSJavaLattice<String> lattice, String start, Set<String> endSet,
+ int dist, boolean isShared) {
+ System.out.println(" #GETNEWLOCATION:: start=" + start + " endSet=" + endSet + " dist="
+ + dist + " isShared=" + isShared);
+ if (dist == -1) {
+ if (isShared) {
+ // if the node is a shared one, check if the next node is shared
+ // if not, need to insert a new shared node
+ return recur_getNewLocation2(lattice, start, endSet, dist + 1, isShared);
+ } else {
+ return start;
+ }
+
+ }
+ return recur_getNewLocation2(lattice, start, endSet, dist, isShared);
+ }
+
+ private String recur_getNewLocation2(SSJavaLattice<String> lattice, String cur,
+ Set<String> endSet, int dist, boolean isShared) {
+ Set<String> connectedSet = lattice.get(cur);
+ if (connectedSet == null) {
+ connectedSet = new HashSet<String>();
+ }
+
+ System.out.println(" recur_getNewLocation::cur=" + cur + " dist=" + dist
+ + " connectedSet=" + connectedSet + " endSet=" + endSet);
+
+ if (dist == 0 && isShared) {
+ // if the node is shared,
+ // check if there already exists a shared node that has distance d + 1 on the chain
+ if ((cur.equals(lattice.getTopItem()) && connectedSet.containsAll(endSet))
+ || connectedSet.equals(endSet)) {
+ // need to insert a new shared location
+ // it is done after this if statement
+ } else {
+ assert connectedSet.size() == 1;
+ String below = connectedSet.iterator().next();
+ if (lattice.isSharedLoc(below)) {
+ return below;
+ }
+ }
+
+ // need to insert a new shared location
+ Set<String> newChildSet = new HashSet<String>();
+ newChildSet.addAll(connectedSet);
+
+ String newLocName = "ILOC" + (LocationInference.locSeed++);
+ for (Iterator iterator = newChildSet.iterator(); iterator.hasNext();) {
+ String outNode = (String) iterator.next();
+ lattice.put(newLocName, outNode);
+ }
+ lattice.get(cur).clear();
+ lattice.put(cur, newLocName);
+
+ System.out.println(" INSERT NEW SHARED NODE=" + newLocName + " above=" + cur
+ + " below=" + lattice.get(newLocName));
+
+ lattice.addSharedLoc(newLocName);
+
+ return newLocName;
+
+ }
+
+ String next;
+
+ if (cur.equals(lattice.getTopItem()) || connectedSet.equals(endSet) /* || endSet.isEmpty() */) {
+
+ // if ( (cur.equals(lattice.getTopItem()) && connectedSet.containsAll(endSet))
+ // || connectedSet.equals(endSet)) {
+
+ // need to insert a new location
+ String newLocName = "ILOC" + (LocationInference.locSeed++);
+ connectedSet.clear();
+ lattice.put(cur, newLocName);
+
+ System.out.println("#INSERT NEW RELATION cur=" + cur + " newLocName=" + newLocName + "::"
+ + lattice.get(cur));
+
+ for (Iterator iterator = endSet.iterator(); iterator.hasNext();) {
+ String endNode = (String) iterator.next();
+ lattice.put(newLocName, endNode);
+ }
+
+ next = newLocName;
+ System.out.println(" INSERT NEW NODE=" + newLocName + " above=" + cur + " below="
+ + endSet);
+ } else {
+ assert connectedSet.size() == 1;
+ next = connectedSet.iterator().next();
+ if (lattice.isSharedLoc(next)) {
+ return recur_getNewLocation2(lattice, next, endSet, dist, isShared);
+ }
+ }
+ System.out.println(" next=" + next);
+
+ if (dist == 0) {
+ return next;
+ } else {
+ if (!lattice.isSharedLoc(next)) {
+ dist--;
+ }
+ return recur_getNewLocation2(lattice, next, endSet, dist, isShared);
+ }
+
+ }
+
+ public SSJavaLattice<String> insertIntermediateNodesToStraightLine2(Descriptor desc,
+ SSJavaLattice<String> skeletonLattice) {
+ // copy nodes/edges from the parent method/class if possible
+ SSJavaLattice<String> lattice = skeletonLattice.clone();
+
+ Descriptor parentDesc = getParent(desc);
+ if (parentDesc != null) {
+ SSJavaLattice<String> parentLattice = infer.getLattice(parentDesc);
+
+ Map<String, Set<String>> parentMap = parentLattice.getTable();
+ Set<String> parentKeySet = parentMap.keySet();
+ for (Iterator iterator = parentKeySet.iterator(); iterator.hasNext();) {
+ String parentKey = (String) iterator.next();
+ Set<String> parentValueSet = parentMap.get(parentKey);
+ for (Iterator iterator2 = parentValueSet.iterator(); iterator2.hasNext();) {
+ String value = (String) iterator2.next();
+ lattice.put(parentKey, value);
+ }
+ }
+
+ Set<String> parentSharedLocSet = parentLattice.getSharedLocSet();
+ for (Iterator iterator = parentSharedLocSet.iterator(); iterator.hasNext();) {
+ String parentSharedLoc = (String) iterator.next();
+ lattice.addSharedLoc(parentSharedLoc);
+ }
+ }
+
+ // ////
+
// perform DFS that starts from each skeleton/combination node and ends by another
// skeleton/combination node
HierarchyGraph scGraph = infer.getSkeletonCombinationHierarchyGraph(desc);
LocationSummary locSummary = infer.getLocationSummary(desc);
- SSJavaLattice<String> lattice = skeletonLattice.clone();
-
Set<HNode> visited = new HashSet<HNode>();
Set<HNode> nodeSet = simpleGraph.getNodeSet();
- Map<TripleItem, String> mapIntermediateLoc = new HashMap<TripleItem, String>();
+ Map<TripleItem, String> mapIntermediateLoc = getIntermediateLocMap(desc);
+ // Map<TripleItem, String> mapIntermediateLoc = new HashMap<TripleItem, String>();
// System.out.println("*insert=" + desc);
// System.out.println("***nodeSet=" + nodeSet);
// startNode = node;
// }
- Set<HNode> endNodeSetFromSimpleGraph =
- simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(outNode, null);
+ // TODO
+ // Set<HNode> endNodeSetFromSimpleGraph =
+ // simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(outNode, null);
+ // Set<HNode> endCombNodeSet = new HashSet<HNode>();
+ // for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator();
+ // iterator3.hasNext();) {
+ // HNode endNode = (HNode) iterator3.next();
+ // endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode));
+ // }
+
+ Set<HNode> endCombNodeSet = scGraph.getOutgoingNodeSet(startNode);
- // System.out.println("endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph
- // + " from=" + outNode);
- Set<HNode> endCombNodeSet = new HashSet<HNode>();
- for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) {
- HNode endNode = (HNode) iterator3.next();
- endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode));
- }
// System.out.println("endCombNodeSet=" + endCombNodeSet);
visited.add(outNode);
if (endCombNodeSet.size() > 0) {
HNode sharedNode = (HNode) iterator.next();
TripleItem item = mapSharedNodeToTripleItem.get(sharedNode);
String nonSharedLocName = mapIntermediateLoc.get(item);
- // System.out.println("sharedNode=" + sharedNode + " locName=" + nonSharedLocName);
+
+ System.out.println("sharedNode=" + sharedNode + " locName=" + nonSharedLocName);
String newLocName;
if (locSummary.getHNodeNameSetByLatticeLoationName(nonSharedLocName) != null
Set<String> belowElementSet = new HashSet<String>();
belowElementSet.addAll(lattice.get(nonSharedLocName));
- // System.out.println("nonSharedLocName=" + nonSharedLocName + " belowElementSet="
- // + belowElementSet + " newLocName=" + newLocName);
+ System.out.println("nonSharedLocName=" + nonSharedLocName + " belowElementSet="
+ + belowElementSet + " newLocName=" + newLocName);
lattice.insertNewLocationBetween(nonSharedLocName, belowElementSet, newLocName);
} else {
}
HierarchyGraph simpleGraph = infer.getSimpleHierarchyGraph(desc);
+ HierarchyGraph scGraph = infer.getSkeletonCombinationHierarchyGraph(desc);
Set<HNode> combineSkeletonNodeSet = simpleGraph.getCombineSetByCombinationNode(cnode);
// System.out.println("combinationNodeSet=" + combinationNodeSet);
- Set<HNode> endNodeSetFromSimpleGraph =
- simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(cnode, combinationNodeSet);
+ // TODO
+ // Set<HNode> endNodeSetFromSimpleGraph =
+ // simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(cnode, combinationNodeSet);
// System.out.println("-endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph);
- Set<HNode> endCombNodeSet = new HashSet<HNode>();
- for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) {
- HNode endNode = (HNode) iterator3.next();
- endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode));
- }
+ // Set<HNode> endCombNodeSet = new HashSet<HNode>();
+ // for (Iterator iterator3 = endNodeSetFromSimpleGraph.iterator(); iterator3.hasNext();) {
+ // HNode endNode = (HNode) iterator3.next();
+ // endCombNodeSet.add(getCombinationNodeInSCGraph(desc, endNode));
+ // }
+
+ Set<HNode> endCombNodeSet = scGraph.getOutgoingNodeSet(combinationNodeInSCGraph);
visited.add(cnode);
// follows the straight line up to another skeleton/combination node
int idx, LocationSummary locSummary, HNode curNode) {
TripleItem item = new TripleItem(startNode, endNodeSet, idx);
- // System.out.println("item=" + item);
if (!mapIntermediateLoc.containsKey(item)) {
// need to create a new intermediate location in the lattice
String newLocName = "ILOC" + (LocationInference.locSeed++);
if (curNode.isSharedNode()) {
// if the current node is shared location, add a shared location to the lattice later
+ System.out.println("###SHARED ITEM=" + item);
mapSharedNodeToTripleItem.put(curNode, item);
} else {
Set<Descriptor> descSet = simpleHierarchyGraph.getDescSetOfNode(curNode);
System.out.println("---incomingHNodeSetToOutNode=" + incomingHNodeSetToOutNode);
if (!outNode.isSkeleton() && !outNode.isCombinationNode() && !visited.contains(outNode)) {
+ Pair<HNode, HNode> pair = new Pair(startNode, outNode);
if (visited.containsAll(simpleHierarchyGraph.getIncomingNodeSet(outNode))) {
visited.add(outNode);
- int newidx = getCurrentHighestIndex(outNode, idx + 1);
+ int newidx = getCurrentHighestIndex(pair, idx + 1);
+ // int newidx = getCurrentHighestIndex(outNode, idx + 1);
recurDFSNormalNode(desc, lattice, startNode, endNodeSet, visited, mapIntermediateLoc,
newidx, locSummary, outNode);
// recurDFSNormalNode(desc, lattice, startNode, endNodeSet, visited, mapIntermediateLoc,
// idx + 1, locSummary, outNode);
} else {
- updateHighestIndex(outNode, idx + 1);
+ updateHighestIndex(pair, idx + 1);
+ // updateHighestIndex(outNode, idx + 1);
System.out.println("NOT RECUR");
}
} else if (!outNode.isSkeleton() && outNode.isCombinationNode() && !visited.contains(outNode)) {
String locName = mapIntermediateLoc.get(item);
if (curNode.isSharedNode()) {
// if the current node is shared location, add a shared location to the lattice later
+ System.out.println("###SHARED ITEM=" + item);
mapSharedNodeToTripleItem.put(curNode, item);
} else {
Set<Descriptor> descSet = simpleHierarchyGraph.getDescSetOfNode(curNode);
// check whether the next combination node is different from the current node
if (combinationNodeInSCGraph.equals(getCombinationNodeInSCGraph(desc, outNode))) {
+ Pair<HNode, HNode> pair = new Pair(combinationNodeInSCGraph, outNode);
if (visited.containsAll(incomingCombinedHNodeSet)) {
visited.add(outNode);
System.out.println("-------curIdx=" + (idx + 1));
- int newIdx = getCurrentHighestIndex(outNode, idx + 1);
+
+ int newIdx = getCurrentHighestIndex(pair, idx + 1);
+ // int newIdx = getCurrentHighestIndex(outNode, idx + 1);
System.out.println("-------newIdx=" + newIdx);
recurDFS(desc, lattice, combinationNodeInSCGraph, endNodeSet, visited,
mapIntermediateLoc, newIdx, locSummary, outNode);
// recurDFS(desc, lattice, combinationNodeInSCGraph, endNodeSet, visited,
// mapIntermediateLoc, idx + 1, locSummary, outNode);
} else {
- updateHighestIndex(outNode, idx + 1);
+ updateHighestIndex(pair, idx + 1);
+ // updateHighestIndex(outNode, idx + 1);
System.out.println("-----NOT RECUR!");
}
} else {
}
+ private int getCurrentHighestIndex(Pair<HNode, HNode> pair, int curIdx) {
+ int recordedIdx = getCurrentHighestIndex(pair);
+ if (recordedIdx > curIdx) {
+ return recordedIdx;
+ } else {
+ return curIdx;
+ }
+ }
+
private int getCurrentHighestIndex(HNode node, int curIdx) {
int recordedIdx = getCurrentHighestIndex(node);
if (recordedIdx > curIdx) {
}
}
+ private int getCurrentHighestIndex(Pair<HNode, HNode> pair) {
+ if (!mapItemToHighestIndex.containsKey(pair)) {
+ mapItemToHighestIndex.put(pair, new Integer(-1));
+ }
+ return mapItemToHighestIndex.get(pair).intValue();
+ }
+
+ private void updateHighestIndex(Pair<HNode, HNode> pair, int idx) {
+ if (idx > getCurrentHighestIndex(pair)) {
+ mapItemToHighestIndex.put(pair, new Integer(idx));
+ }
+ }
+
private int getCurrentHighestIndex(HNode node) {
if (!mapHNodeToHighestIndex.containsKey(node)) {
mapHNodeToHighestIndex.put(node, new Integer(-1));
private void debug_print(HierarchyGraph inputGraph) {
System.out.println("\nBuild Lattice:" + inputGraph.getName());
- // System.out.println("Node2Index:\n" + inputGraph.getMapHNodeToUniqueIndex());
- // System.out.println("Node2Basis:\n" + inputGraph.getMapHNodeToBasis());
+ System.out.println("Node2Index:\n" + inputGraph.getMapHNodeToUniqueIndex());
+ System.out.println("Node2Basis:\n" + inputGraph.getMapHNodeToBasis());
}
}
projects / IRC.git / blobdiff