import java.util.Map;
import java.util.Set;
+import IR.ClassDescriptor;
import IR.Descriptor;
+import IR.MethodDescriptor;
+import IR.NameDescriptor;
import Util.Pair;
public class BuildLattice {
- public static int seed = 0;
private LocationInference infer;
+ private Map<HNode, TripleItem> mapSharedNodeToTripleItem;
+ private Map<HNode, Integer> mapHNodeToHighestIndex;
+
+ private Map<Descriptor, Map<TripleItem, String>> mapDescToIntermediateLocMap;
+
+ private Map<Pair<HNode, HNode>, Integer> mapItemToHighestIndex;
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>>();
}
public SSJavaLattice<String> buildLattice(Descriptor desc) {
HierarchyGraph inputGraph = infer.getSkeletonCombinationHierarchyGraph(desc);
LocationSummary locSummary = infer.getLocationSummary(desc);
- BasisSet basisSet = inputGraph.computeBasisSet();
- debug_print(inputGraph);
+ 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);
+
+ for (Iterator iterator = inputGraph.getNodeSet().iterator(); iterator.hasNext();) {
+ HNode hnode = (HNode) iterator.next();
+ Descriptor hnodeDesc = hnode.getDescriptor();
+ if (hnodeDesc != null) {
+ NTuple<Descriptor> descTuple = new NTuple<Descriptor>();
+ descTuple.add(hnodeDesc);
+
+ if (flowGraph.contains(descTuple)) {
+ FlowNode flowNode = flowGraph.getFlowNode(descTuple);
+ if (flowNode.getCompositeLocation() != null) {
+ nodeSetWithCompositeLocation.add(hnode);
+ }
+ }
+
+ }
+ }
+
+ }
+
+ // /////////////////////////////////////////////////////////////////////////////////////
+ // 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);
Family family = generateFamily(basisSet);
Map<Set<Integer>, Set<Set<Integer>>> mapImSucc = coveringGraph(basisSet, family);
- SSJavaLattice<String> lattice = buildLattice(basisSet, inputGraph, locSummary, mapImSucc);
+ SSJavaLattice<String> lattice = buildLattice(desc, basisSet, inputGraph, locSummary, mapImSucc);
return lattice;
}
- private SSJavaLattice<String> buildLattice(BasisSet basisSet, HierarchyGraph inputGraph,
- LocationSummary locSummary, Map<Set<Integer>, Set<Set<Integer>>> mapImSucc) {
+ 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<Integer> higher = (Set<Integer>) iterator.next();
String higherName = generateElementName(basisSet, inputGraph, mapFToLocName, higher);
- locSummary.addMapHNodeNameToLocationName(higherName, higherName);
HNode higherNode = inputGraph.getHNode(higherName);
+
+ if (higherNode == null) {
+ NameDescriptor d = new NameDescriptor(higherName);
+ higherNode = inputGraph.getHNode(d);
+ higherNode.setSkeleton(true);
+ }
+
if (higherNode != null && higherNode.isSharedNode()) {
lattice.addSharedLoc(higherName);
}
+ Set<Descriptor> descSet = inputGraph.getDescSetOfNode(higherNode);
+ // System.out.println("higherName=" + higherName + " higherNode=" + higherNode + " descSet="
+ // + descSet);
+
+ 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);
for (Iterator iterator2 = lowerSet.iterator(); iterator2.hasNext();) {
Set<Integer> lower = (Set<Integer>) iterator2.next();
String lowerName = generateElementName(basisSet, inputGraph, mapFToLocName, lower);
- locSummary.addMapHNodeNameToLocationName(lowerName, lowerName);
+ HNode lowerNode = inputGraph.getHNode(lowerName);
+
+ if (lowerNode == null && !lowerName.equals(SSJavaAnalysis.BOTTOM)) {
+ NameDescriptor d = new NameDescriptor(lowerName);
+ lowerNode = inputGraph.getHNode(d);
+ lowerNode.setSkeleton(true);
+ }
+
+ if (lowerNode != null && !inputGraph.isDirectlyConnectedTo(higherNode, lowerNode)) {
+ inputGraph.addEdge(higherNode, lowerNode);
+ }
- HNode lowerNode = inputGraph.getHNode(higherName);
if (lowerNode != null && lowerNode.isSharedNode()) {
lattice.addSharedLoc(lowerName);
}
+ Set<Descriptor> lowerDescSet = inputGraph.getDescSetOfNode(lowerNode);
+ // System.out.println("lowerName=" + lowerName + " lowerNode=" + lowerNode + " descSet="
+ // + lowerDescSet);
+ if (locSummary != null) {
+ for (Iterator iterator3 = lowerDescSet.iterator(); iterator3.hasNext();) {
+ Descriptor d = (Descriptor) iterator3.next();
+ locSummary.addMapHNodeNameToLocationName(d.getSymbol(), lowerName);
+ }
+ }
+ // locSummary.addMapHNodeNameToLocationName(lowerName, lowerName);
+
if (higher.size() == 0) {
// empty case
lattice.put(lowerName);
}
+ inputGraph.removeRedundantEdges();
return lattice;
}
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("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;
+
+ 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);
+ SCNode = scGraph.getCombinationNode(combineSet);
+ numNonSharedNodes = -1;
+ } else {
+
+ Set<HNode> aboveSet = new HashSet<HNode>();
+ if (hNode.isCombinationNode()) {
+ Set<HNode> combineSkeletonNodeSet =
+ hierarchyGraph.getCombineSetByCombinationNode(hNode);
+
+ aboveSet.addAll(hierarchyGraph
+ .getFirstNodeOfCombinationNodeChainSet(combineSkeletonNodeSet));
+ SCNode = scGraph.getCombinationNode(combineSkeletonNodeSet);
+ } else {
+ System.out.println(" #######hierarchyGraph.getSkeleteNodeSetReachTo(" + hNode + ")="
+ + hierarchyGraph.getSkeleteNodeSetReachTo(hNode));
+
+ aboveSet.addAll(hierarchyGraph.getSkeleteNodeSetReachTo(hNode));
+ // 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));
+ }
+ numNonSharedNodes = hierarchyGraph.countNonSharedNode(hNode, endSet);
+
+ System.out.println(" node=" + hNode + " above=" + endSet + " distance="
+ + numNonSharedNodes + " 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<String> outgoingElements = skeletonLattice.get(SCNode.getName());
+ System.out.println(" SCNODE outgoing=" + outgoingElements);
+
+ // 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, SCNode.getName(), outgoingElements, numNonSharedNodes,
+ hNode.isSharedNode());
+ System.out.println(" locName=" + locName);
+ locSummary.addMapHNodeNameToLocationName(hNode.getName(), locName);
+
+ }
+ }
+
+ return lattice;
+ }
+
+ 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) {
+ return start;
+ }
+ return recur_getNewLocation(lattice, start, endSet, dist, isShared);
+ }
+
+ private String recur_getNewLocation(SSJavaLattice<String> lattice, String cur,
+ Set<String> endSet, int dist, boolean isShared) {
+ System.out.println("H");
+ 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
+ connectedSet = lattice.get(cur);
+ if (connectedSet.equals(endSet)) {
+ // need to insert a new shared location
+ } else {
+ assert connectedSet.size() == 1;
+ String below = connectedSet.iterator().next();
+ if (lattice.isSharedLoc(below)) {
+ return below;
+ }
+ }
+
+ // need to insert a new shared location
+ String newLocName = "ILOC" + (LocationInference.locSeed++);
+ for (Iterator iterator = connectedSet.iterator(); iterator.hasNext();) {
+ String outNode = (String) iterator.next();
+ lattice.put(newLocName, outNode);
+ }
+ connectedSet.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 (connectedSet.equals(endSet)) {
+ // need to insert a new location
+ String newLocName = "ILOC" + (LocationInference.locSeed++);
+ connectedSet.clear();
+ lattice.put(cur, newLocName);
+ System.out.println("NEW RELATION=" + 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();
+ }
+ System.out.println(" next=" + next);
+
+ // if (dist == 0) {
+
+ // if (isShared) {
+
+ // // if the node is shared,
+ // // check if there already exists a shared node that has distance d + 1 on the chain
+ //
+ // connectedSet = lattice.get(next);
+ //
+ // if (connectedSet.equals(endSet)) {
+ // // need to insert a new shared location
+ // } else {
+ // assert connectedSet.size() != 1;
+ // String below = connectedSet.iterator().next();
+ // if (lattice.isSharedLoc(below)) {
+ // return below;
+ // }
+ // }
+ //
+ // // need to insert a new shared location
+ // String newLocName = "ILOC" + (LocationInference.locSeed++);
+ // for (Iterator iterator = connectedSet.iterator(); iterator.hasNext();) {
+ // String outNode = (String) iterator.next();
+ // lattice.put(newLocName, outNode);
+ // }
+ // connectedSet.clear();
+ // lattice.put(next, newLocName);
+ //
+ // System.out.println(" INSERT NEW SHARED NODE=" + newLocName + " above=" + next
+ // + " below=" + lattice.get(newLocName));
+ //
+ // lattice.addSharedLoc(newLocName);
+ //
+ // next = newLocName;
+ //
+ // }
+ //
+ // return next;
+
+ // } else {
+
+ if (dist == 0) {
+ return next;
+ } else {
+ if (!lattice.isSharedLoc(next)) {
+ dist--;
+ }
+ return recur_getNewLocation(lattice, next, endSet, dist, isShared);
+ }
+
+ // }
+
+ // ///////////////////////////////////////////////
+
+ // if (dist == 0) {
+ // return cur;
+ // } else if (connectedSet.equals(endSet)) {
+ // // need to insert a new location
+ // String newLocName = "ILOC" + (LocationInference.locSeed++);
+ // connectedSet.clear();
+ // lattice.put(cur, newLocName);
+ // for (Iterator iterator = endSet.iterator(); iterator.hasNext();) {
+ // String endNode = (String) iterator.next();
+ // lattice.put(newLocName, endNode);
+ // }
+ // return recur_getNewLocation(lattice, newLocName, endSet, --dist, isShared);
+ // } else {
+ // assert connectedSet.size() != 1;
+ // String next = connectedSet.iterator().next();
+ // return recur_getNewLocation(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
+ mapSharedNodeToTripleItem.clear();
+
HierarchyGraph simpleGraph = infer.getSimpleHierarchyGraph(desc);
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);
for (Iterator iterator = nodeSet.iterator(); iterator.hasNext();) {
HNode node = (HNode) iterator.next();
+ System.out.println("node=" + node);
+
if (node.isSkeleton() && (!visited.contains(node))) {
visited.add(node);
if (!outNode.isSkeleton()) {
if (outNode.isCombinationNode()) {
- // expand the combination node 'outNode'
- System.out.println("-COMBINATION NODE=" + outNode);
- // here we need to expand the corresponding combination location in the lattice
- HNode combinationNodeInSCGraph = getCombinationNodeInSCGraph(desc, outNode);
-
- Set<HNode> combineSkeletonNodeSet =
- simpleGraph.getCombineSetByCombinationNode(outNode);
-
- System.out.println("combineSkeletonNodeSet=" + combineSkeletonNodeSet);
-
- Set<HNode> combinationNodeSet =
- simpleGraph.getCombinationNodeSetByCombineNodeSet(combineSkeletonNodeSet);
-
- System.out.println("combinationNodeSet=" + combinationNodeSet);
-
- Set<HNode> endNodeSetFromSimpleGraph =
- simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(outNode,
- 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));
- }
- System.out.println("-endCombNodeSet=" + endCombNodeSet);
- visited.add(outNode);
-
- // follows the straight line up to another skeleton/combination node
- if (endCombNodeSet.size() > 0) {
- endCombNodeSet =
- removeTransitivelyReachToNode(desc, combinationNodeInSCGraph, endCombNodeSet);
- recurDFS(desc, lattice, combinationNodeInSCGraph, endCombNodeSet, visited,
- mapIntermediateLoc, 1, locSummary, outNode);
- // recurDFS(desc, lattice, combinationNodeInSCGraph, endCombNodeSet, visited,
- // mapIntermediateLoc, 1, locSummary, outNode);
+ if (visited.containsAll(simpleGraph.getIncomingNodeSet(outNode))) {
+ // if (needToExpandCombinationNode(desc, outNode)) {
+ expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary,
+ outNode);
+ // }
}
-
} else {
// we have a node that is neither combination or skeleton node
- System.out.println("skeleton node=" + node + " outNode=" + outNode);
+ // System.out.println("%%%skeleton node=" + node + " outNode=" + outNode);
HNode startNode = scGraph.getCurrentHNode(node);
// if (node.getDescriptor() != null) {
// 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));
+ // }
- 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));
- }
+ Set<HNode> endCombNodeSet = scGraph.getOutgoingNodeSet(startNode);
+ // System.out.println("endCombNodeSet=" + endCombNodeSet);
visited.add(outNode);
if (endCombNodeSet.size() > 0) {
// follows the straight line up to another skeleton/combination node
endCombNodeSet = removeTransitivelyReachToNode(desc, startNode, endCombNodeSet);
- recurDFSNormalNode(desc, lattice, startNode, endCombNodeSet, visited,
- mapIntermediateLoc, 1, locSummary, outNode);
+ } else if (endCombNodeSet.size() == 0) {
+ // the outNode is (directly/transitively) connected to the bottom node
+ // therefore, we just add a dummy bottom HNode to the endCombNodeSet.
+ endCombNodeSet.add(LocationInference.BOTTOMHNODE);
}
+
+ recurDFSNormalNode(desc, lattice, startNode, endCombNodeSet, visited,
+ mapIntermediateLoc, 1, locSummary, outNode);
}
}
}
} else if (!node.isSkeleton() && !node.isCombinationNode() && !node.isMergeNode()
&& !visited.contains(node)) {
+
+ System.out.println("n=" + node);
+
// an intermediate node 'node' may be located between "TOP" location and a skeleton node
- // but there is no such a case.
+ if (simpleGraph.getIncomingNodeSet(node).size() == 0) {
+
+ // this node will be directly connected to the TOP location
+ // start adding the following nodes from this node
- // Set<HNode> outNodeSet = simpleGraph.getOutgoingNodeSet(node);
- // Set<String> belowSkeletonLocNameSet = new HashSet<String>();
- // for (Iterator iterator2 = outNodeSet.iterator(); iterator2.hasNext();) {
- // HNode outNode = (HNode) iterator2.next();
- // if (outNode.isSkeleton()) {
- // belowSkeletonLocNameSet.add(scGraph.getCurrentHNode(outNode).getName());
- // }
- // }
- // String newLocName = "ILOC" + (seed++);
- // lattice.insertNewLocationBetween(lattice.getTopItem(), belowSkeletonLocNameSet,
- // newLocName);
- // locSummary.addMapHNodeNameToLocationName(node.getName(), newLocName);
+ Set<HNode> endNodeSetFromSimpleGraph =
+ simpleGraph.getDirectlyReachableSkeletonCombinationNodeFrom(node, null);
+
+ 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);
+ HNode startNode = LocationInference.TOPHNODE;
+ visited.add(startNode);
+ if (endCombNodeSet.size() > 0) {
+ // follows the straight line up to another skeleton/combination node
+ // endCombNodeSet = removeTransitivelyReachToNode(desc, node, endCombNodeSet);
+ recurDFSNormalNode(desc, lattice, startNode, endCombNodeSet, visited,
+ mapIntermediateLoc, 1, locSummary, node);
+ }
+
+ }
}
}
+ // add shared locations
+ Set<HNode> sharedNodeSet = mapSharedNodeToTripleItem.keySet();
+ for (Iterator iterator = sharedNodeSet.iterator(); iterator.hasNext();) {
+ HNode sharedNode = (HNode) iterator.next();
+ TripleItem item = mapSharedNodeToTripleItem.get(sharedNode);
+ String nonSharedLocName = mapIntermediateLoc.get(item);
+
+ System.out.println("sharedNode=" + sharedNode + " locName=" + nonSharedLocName);
+
+ String newLocName;
+ if (locSummary.getHNodeNameSetByLatticeLoationName(nonSharedLocName) != null
+ && !lattice.isSharedLoc(nonSharedLocName)) {
+ // need to generate a new shared location in the lattice, which is one level lower than the
+ // 'locName' location
+ newLocName = "ILOC" + (LocationInference.locSeed++);
+
+ // Set<String> aboveElementSet = getAboveElementSet(lattice, locName);
+ Set<String> belowElementSet = new HashSet<String>();
+ belowElementSet.addAll(lattice.get(nonSharedLocName));
+
+ System.out.println("nonSharedLocName=" + nonSharedLocName + " belowElementSet="
+ + belowElementSet + " newLocName=" + newLocName);
+
+ lattice.insertNewLocationBetween(nonSharedLocName, belowElementSet, newLocName);
+ } else {
+ newLocName = nonSharedLocName;
+ }
+
+ lattice.addSharedLoc(newLocName);
+ HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc);
+ Set<Descriptor> descSet = graph.getDescSetOfNode(sharedNode);
+ for (Iterator iterator2 = descSet.iterator(); iterator2.hasNext();) {
+ Descriptor d = (Descriptor) iterator2.next();
+ locSummary.addMapHNodeNameToLocationName(d.getSymbol(), newLocName);
+ }
+ locSummary.addMapHNodeNameToLocationName(sharedNode.getName(), newLocName);
+
+ }
+
return lattice;
}
+ private Set<String> getAboveElementSet(SSJavaLattice<String> lattice, String loc) {
+
+ Set<String> aboveSet = new HashSet<String>();
+
+ Map<String, Set<String>> latticeMap = lattice.getTable();
+ Set<String> keySet = latticeMap.keySet();
+ for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+ String key = (String) iterator.next();
+ if (latticeMap.get(key).contains(loc)) {
+ aboveSet.add(key);
+ }
+ }
+
+ return aboveSet;
+ }
+
+ private boolean needToExpandCombinationNode(Descriptor desc, HNode cnode) {
+
+ System.out.println("needToExpandCombinationNode?=" + cnode);
+
+ HierarchyGraph simpleGraph = infer.getSimpleHierarchyGraph(desc);
+ // HNode combinationNodeInSCGraph = getCombinationNodeInSCGraph(desc, cnode);
+ Set<HNode> combineSkeletonNodeSet = simpleGraph.getCombineSetByCombinationNode(cnode);
+ Set<HNode> combinationNodeSetInSimpleGraph =
+ simpleGraph.getCombinationNodeSetByCombineNodeSet(combineSkeletonNodeSet);
+ System.out.println("---combinationNodeSetInSimpleGraph=" + combinationNodeSetInSimpleGraph);
+ Set<HNode> inNodeSetToCNode = simpleGraph.getIncomingNodeSet(cnode);
+ System.out.println("------inNodeSetToCNode=" + inNodeSetToCNode);
+ for (Iterator iterator = combinationNodeSetInSimpleGraph.iterator(); iterator.hasNext();) {
+ HNode nodeBelongToTheSameCombinationNode = (HNode) iterator.next();
+ if (inNodeSetToCNode.contains(nodeBelongToTheSameCombinationNode)) {
+ // the combination node 'cnode' is not the highest location among the same combination node
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ private void expandCombinationNode(Descriptor desc, SSJavaLattice<String> lattice,
+ Set<HNode> visited, Map<TripleItem, String> mapIntermediateLoc, LocationSummary locSummary,
+ HNode cnode) {
+
+ // expand the combination node 'outNode'
+ // here we need to expand the corresponding combination location in the lattice
+ HNode combinationNodeInSCGraph = getCombinationNodeInSCGraph(desc, cnode);
+
+ System.out.println("expandCombinationNode=" + cnode + " cnode in scgraph="
+ + combinationNodeInSCGraph);
+
+ if (combinationNodeInSCGraph == null) {
+ return;
+ }
+
+ HierarchyGraph simpleGraph = infer.getSimpleHierarchyGraph(desc);
+ HierarchyGraph scGraph = infer.getSkeletonCombinationHierarchyGraph(desc);
+
+ Set<HNode> combineSkeletonNodeSet = simpleGraph.getCombineSetByCombinationNode(cnode);
+
+ // System.out.println("combineSkeletonNodeSet=" + combineSkeletonNodeSet);
+
+ Set<HNode> combinationNodeSet =
+ simpleGraph.getCombinationNodeSetByCombineNodeSet(combineSkeletonNodeSet);
+
+ // System.out.println("combinationNodeSet=" + 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 = scGraph.getOutgoingNodeSet(combinationNodeInSCGraph);
+ visited.add(cnode);
+
+ // follows the straight line up to another skeleton/combination node
+ if (endCombNodeSet.size() > 0) {
+ // System.out.println("---endCombNodeSet=" + endCombNodeSet);
+ endCombNodeSet =
+ removeTransitivelyReachToNode(desc, combinationNodeInSCGraph, endCombNodeSet);
+
+ recurDFS(desc, lattice, combinationNodeInSCGraph, endCombNodeSet, visited,
+ mapIntermediateLoc, 1, locSummary, cnode);
+ } else {
+ endCombNodeSet.add(LocationInference.BOTTOMHNODE);
+ // System.out.println("---endCombNodeSet is zero");
+ // System.out.println("---endNodeSetFromSimpleGraph=" + endNodeSetFromSimpleGraph);
+ // System.out.println("---incoming=" + simpleGraph.getIncomingNodeSet(cnode));
+ recurDFS(desc, lattice, combinationNodeInSCGraph, endCombNodeSet, visited,
+ mapIntermediateLoc, 1, locSummary, cnode);
+
+ }
+
+ }
+
private Set<HNode> removeTransitivelyReachToNode(Descriptor desc, HNode startNode,
Set<HNode> endNodeSet) {
// replace it with a directly connected one which transitively reaches to it.
HierarchyGraph scGraph = infer.getSkeletonCombinationHierarchyGraph(desc);
- Set<HNode> newEndNodeSet = new HashSet<HNode>();
+ Set<HNode> newEndNodeSet = new HashSet<HNode>();
for (Iterator iterator = endNodeSet.iterator(); iterator.hasNext();) {
HNode endNode = (HNode) iterator.next();
if (scGraph.isDirectlyConnectedTo(startNode, endNode)) {
} else {
HNode newEndNode =
getDirectlyReachableNodeFromStartNodeReachToEndNode(scGraph, startNode, endNode);
- System.out.println("#### old END NODE=" + endNode + " --->" + newEndNode);
+ // System.out.println("#### old END NODE=" + endNode + " --->" + newEndNode);
newEndNodeSet.add(newEndNode);
}
}
- System.out.println("removeTransitivelyReachToNode=" + endNodeSet + " newSet=" + newEndNodeSet);
+ // System.out.println("removeTransitivelyReachToNode=" + endNodeSet + " newSet=" +
+ // newEndNodeSet);
return newEndNodeSet;
}
+ private HNode getDirectlyReachableSCNodeFromEndNode(HierarchyGraph scGraph, HNode startNode,
+ Set<HNode> endNodeSet) {
+
+ // System.out.println("getDirectlyReachableSCNodeFromEndNode start=" + startNode +
+ // " endNodeSet="
+ // + endNodeSet);
+ Set<HNode> newStartNodeSet = new HashSet<HNode>();
+
+ for (Iterator iterator = endNodeSet.iterator(); iterator.hasNext();) {
+ HNode endNode = (HNode) iterator.next();
+ Set<HNode> connectedToEndNodeSet = scGraph.getIncomingNodeSet(endNode);
+
+ for (Iterator iterator2 = connectedToEndNodeSet.iterator(); iterator2.hasNext();) {
+ HNode curNode = (HNode) iterator2.next();
+ if (recurConnectedFromStartNode(scGraph, startNode, curNode, new HashSet<HNode>())) {
+ newStartNodeSet.add(curNode);
+ }
+ }
+ }
+
+ // System.out.println("newStartNodeSet=" + newStartNodeSet);
+
+ if (newStartNodeSet.size() == 0) {
+ newStartNodeSet.add(startNode);
+ }
+
+ return newStartNodeSet.iterator().next();
+ }
+
+ private boolean recurConnectedFromStartNode(HierarchyGraph scGraph, HNode startNode,
+ HNode curNode, Set<HNode> visited) {
+ // return true if curNode is transitively connected from the startNode
+
+ boolean isConnected = false;
+ Set<HNode> inNodeSet = scGraph.getIncomingNodeSet(curNode);
+ for (Iterator iterator = inNodeSet.iterator(); iterator.hasNext();) {
+ HNode in = (HNode) iterator.next();
+ if (in.equals(startNode)) {
+ return true;
+ } else {
+ visited.add(in);
+ isConnected |= recurConnectedFromStartNode(scGraph, startNode, in, visited);
+ }
+ }
+
+ return isConnected;
+ }
+
private HNode getDirectlyReachableNodeFromStartNodeReachToEndNode(HierarchyGraph scGraph,
HNode startNode, HNode endNode) {
+ // System.out.println("getDirectlyReachableNodeFromStartNodeReachToEndNode start=" + startNode
+ // + " end=" + endNode);
Set<HNode> connected = new HashSet<HNode>();
recurDirectlyReachableNodeFromStartNodeReachToEndNode(scGraph, startNode, endNode, connected);
+ if (connected.size() == 0) {
+ connected.add(endNode);
+ }
+ // System.out.println("connected=" + connected);
+
return connected.iterator().next();
}
if (inNode.equals(startNode)) {
connected.add(curNode);
} else {
- System.out.println("inNode=" + inNode);
recurDirectlyReachableNodeFromStartNodeReachToEndNode(scGraph, startNode, inNode, connected);
}
}
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" + (seed++);
+ String newLocName = "ILOC" + (LocationInference.locSeed++);
String above;
if (idx == 1) {
above = startNode.getName();
Set<String> belowSet = new HashSet<String>();
for (Iterator iterator = endNodeSet.iterator(); iterator.hasNext();) {
HNode endNode = (HNode) iterator.next();
- belowSet.add(endNode.getName());
+ String locName;
+ if (locSummary.getMapHNodeNameToLocationName().containsKey(endNode.getName())) {
+ locName = locSummary.getLocationName(endNode.getName());
+ } else {
+ locName = endNode.getName();
+ }
+ belowSet.add(locName);
}
-
lattice.insertNewLocationBetween(above, belowSet, newLocName);
mapIntermediateLoc.put(item, newLocName);
}
String locName = mapIntermediateLoc.get(item);
- locSummary.addMapHNodeNameToLocationName(curNode.getName(), locName);
+ HierarchyGraph simpleHierarchyGraph = infer.getSimpleHierarchyGraph(desc);
- HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc);
- Set<HNode> outSet = graph.getOutgoingNodeSet(curNode);
+ 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);
+ for (Iterator iterator = descSet.iterator(); iterator.hasNext();) {
+ Descriptor d = (Descriptor) iterator.next();
+ locSummary.addMapHNodeNameToLocationName(d.getSymbol(), locName);
+ }
+ locSummary.addMapHNodeNameToLocationName(curNode.getName(), locName);
+ }
+
+ System.out.println("-TripleItem normal=" + item);
+ System.out.println("-curNode=" + curNode.getName() + " S=" + curNode.isSharedNode()
+ + " locName=" + locName + " isC=" + curNode.isCombinationNode());
+
+ Set<HNode> outSet = simpleHierarchyGraph.getOutgoingNodeSet(curNode);
for (Iterator iterator2 = outSet.iterator(); iterator2.hasNext();) {
HNode outNode = (HNode) iterator2.next();
+
+ Set<HNode> incomingHNodeSetToOutNode = simpleHierarchyGraph.getIncomingNodeSet(outNode);
+ System.out.println("outNode=" + outNode);
+ System.out.println("---incomingHNodeSetToOutNode=" + incomingHNodeSetToOutNode);
+
if (!outNode.isSkeleton() && !outNode.isCombinationNode() && !visited.contains(outNode)) {
- visited.add(outNode);
- recurDFSNormalNode(desc, lattice, startNode, endNodeSet, visited, mapIntermediateLoc,
- idx + 1, locSummary, outNode);
+ Pair<HNode, HNode> pair = new Pair(startNode, outNode);
+ if (visited.containsAll(simpleHierarchyGraph.getIncomingNodeSet(outNode))) {
+ visited.add(outNode);
+ 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(pair, idx + 1);
+ // updateHighestIndex(outNode, idx + 1);
+ System.out.println("NOT RECUR");
+ }
+ } else if (!outNode.isSkeleton() && outNode.isCombinationNode() && !visited.contains(outNode)) {
+ if (needToExpandCombinationNode(desc, outNode)) {
+ System.out.println("NEED TO");
+ expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode);
+ } else {
+ System.out.println("NOT NEED TO");
+ }
}
+
}
}
String newLocName = combinationNodeInSCGraph.getName();
mapIntermediateLoc.put(item, newLocName);
} else {
- String newLocName = "ILOC" + (seed++);
+ String newLocName = "ILOC" + (LocationInference.locSeed++);
int prevIdx = idx - 1;
TripleItem prevItem = new TripleItem(combinationNodeInSCGraph, endNodeSet, prevIdx);
above = mapIntermediateLoc.get(prevItem);
}
lattice.insertNewLocationBetween(above, belowSet, newLocName);
mapIntermediateLoc.put(item, newLocName);
-
}
}
+ // TODO
+ // Do we need to skip the combination node and assign a shared location to the next node?
+ // if (idx == 1 && curNode.isSharedNode()) {
+ // System.out.println("THE FIRST COMBINATION NODE EXPANSION IS SHARED!");
+ // recurDFS(desc, lattice, combinationNodeInSCGraph, endNodeSet, visited, mapIntermediateLoc,
+ // idx + 1, locSummary, curNode);
+ // return;
+ // }
+
+ HierarchyGraph simpleHierarchyGraph = infer.getSimpleHierarchyGraph(desc);
String locName = mapIntermediateLoc.get(item);
- locSummary.addMapHNodeNameToLocationName(curNode.getName(), locName);
+ 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);
+ for (Iterator iterator = descSet.iterator(); iterator.hasNext();) {
+ Descriptor d = (Descriptor) iterator.next();
+ locSummary.addMapHNodeNameToLocationName(d.getSymbol(), locName);
+ }
+ locSummary.addMapHNodeNameToLocationName(curNode.getName(), locName);
+ }
System.out.println("-TripleItem=" + item);
- System.out.println("-curNode=" + curNode.getName() + " locName=" + locName);
+ System.out.println("-curNode=" + curNode.getName() + " S=" + curNode.isSharedNode()
+ + " locName=" + locName);
- HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc);
- Set<HNode> outSet = graph.getOutgoingNodeSet(curNode);
+ Set<HNode> outSet = simpleHierarchyGraph.getOutgoingNodeSet(curNode);
for (Iterator iterator2 = outSet.iterator(); iterator2.hasNext();) {
HNode outNode = (HNode) iterator2.next();
+ System.out.println("---recurDFS outNode=" + outNode);
+ System.out.println("---cur combinationNodeInSCGraph=" + combinationNodeInSCGraph);
+ System.out.println("---outNode combinationNodeInSCGraph="
+ + getCombinationNodeInSCGraph(desc, outNode));
+
if (!outNode.isSkeleton() && !visited.contains(outNode)) {
- if (combinationNodeInSCGraph.equals(getCombinationNodeInSCGraph(desc, outNode))) {
- visited.add(outNode);
- recurDFS(desc, lattice, combinationNodeInSCGraph, endNodeSet, visited,
- mapIntermediateLoc, idx + 1, locSummary, outNode);
+ if (outNode.isCombinationNode()) {
+
+ Set<HNode> combineSkeletonNodeSet =
+ simpleHierarchyGraph.getCombineSetByCombinationNode(outNode);
+ Set<HNode> incomingHNodeSetToOutNode = simpleHierarchyGraph.getIncomingNodeSet(outNode);
+ // extract nodes belong to the same combine node
+ Set<HNode> incomingCombinedHNodeSet = new HashSet<HNode>();
+ for (Iterator iterator = incomingHNodeSetToOutNode.iterator(); iterator.hasNext();) {
+ HNode inNode = (HNode) iterator.next();
+ if (combineSkeletonNodeSet.contains(inNode)) {
+ incomingCombinedHNodeSet.add(inNode);
+ }
+ }
+ System.out.println("-----incomingCombinedHNodeSet=" + incomingCombinedHNodeSet);
+
+ // 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(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(pair, idx + 1);
+ // updateHighestIndex(outNode, idx + 1);
+ System.out.println("-----NOT RECUR!");
+ }
+ } else {
+ if (needToExpandCombinationNode(desc, outNode)) {
+ System.out.println("NEED TO");
+ expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode);
+ } else {
+ System.out.println("NOT NEED TO");
+ }
+
+ }
}
}
+ // }
+
+ }
+
+ }
+
+ 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) {
+ return recordedIdx;
+ } else {
+ return 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));
+ }
+ return mapHNodeToHighestIndex.get(node).intValue();
+ }
+
+ private void updateHighestIndex(HNode node, int idx) {
+ if (idx > getCurrentHighestIndex(node)) {
+ mapHNodeToHighestIndex.put(node, new Integer(idx));
+ }
}
private String generateElementName(BasisSet basisSet, HierarchyGraph inputGraph,
if (inputGraph.BASISTOPELEMENT.equals(F)) {
return SSJavaAnalysis.BOTTOM;
} else {
- String str = "LOC" + (seed++);
+ String str = "LOC" + (LocationInference.locSeed++);
mapF2LocName.put(F, str);
return str;
}
resetCount(mapFtoCount, family);
}
- System.out.println("mapImSucc=" + mapImSucc);
+ // System.out.println("mapImSucc=" + mapImSucc);
return mapImSucc;
}
public HNode higherNode;
public Set<HNode> lowerNodeSet;
public int idx;
+ public boolean isShared;
public TripleItem(HNode h, Set<HNode> l, int i) {
higherNode = h;
lowerNodeSet = l;
idx = i;
+ isShared = false;
+ }
+
+ public void setShared(boolean in) {
+ this.isShared = in;
+ }
+
+ public boolean isShared() {
+ return isShared;
}
public int hashCode() {
- return higherNode.hashCode() + lowerNodeSet.hashCode() + idx;
+
+ int h = 0;
+ if (higherNode != null) {
+ h = higherNode.hashCode();
+ }
+
+ if (isShared) {
+ h++;
+ }
+
+ return h + lowerNodeSet.hashCode() + idx;
}
public boolean equals(Object obj) {
if (obj instanceof TripleItem) {
TripleItem in = (TripleItem) obj;
- if (higherNode.equals(in.higherNode) && lowerNodeSet.equals(in.lowerNodeSet) && idx == in.idx) {
+ if ((higherNode == null || (higherNode != null && higherNode.equals(in.higherNode)))
+ && lowerNodeSet.equals(in.lowerNodeSet) && idx == in.idx && isShared == in.isShared()) {
return true;
}
}
}
public String toString() {
- return higherNode + "-" + idx + "->" + lowerNodeSet;
+ String rtr = higherNode + "-" + idx + "->" + lowerNodeSet;
+ if (isShared) {
+ rtr += " S";
+ }
+ return rtr;
}
}
projects / IRC.git / blobdiff