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 {
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);
+ 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
+ BasisSet naiveBasisSet = naiveGraph.computeBasisSet(nodeSetWithCompositeLocation);
+ // debug_print(inputGraph);
+
+ 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);
- 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);
String higherName = generateElementName(basisSet, inputGraph, mapFToLocName, higher);
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);
- 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);
String lowerName = generateElementName(basisSet, inputGraph, mapFToLocName, lower);
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);
+ }
+
if (lowerNode != null && lowerNode.isSharedNode()) {
lattice.addSharedLoc(lowerName);
}
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);
}
+ inputGraph.removeRedundantEdges();
return lattice;
}
public SSJavaLattice<String> insertIntermediateNodesToStraightLine(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);
+ // 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 (!outNode.isSkeleton()) {
if (outNode.isCombinationNode()) {
- expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, 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);
// 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);
String newLocName;
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) {
- System.out.println("expandCombinationNode=" + 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("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
if (endCombNodeSet.size() > 0) {
- System.out.println("---endCombNodeSet=" + endCombNodeSet);
+ // System.out.println("---endCombNodeSet=" + endCombNodeSet);
endCombNodeSet =
removeTransitivelyReachToNode(desc, combinationNodeInSCGraph, endCombNodeSet);
private HNode getDirectlyReachableSCNodeFromEndNode(HierarchyGraph scGraph, HNode startNode,
Set<HNode> endNodeSet) {
- System.out.println("getDirectlyReachableSCNodeFromEndNode start=" + startNode + " endNodeSet="
- + endNodeSet);
+ // System.out.println("getDirectlyReachableSCNodeFromEndNode start=" + startNode +
+ // " endNodeSet="
+ // + endNodeSet);
Set<HNode> newStartNodeSet = new HashSet<HNode>();
for (Iterator iterator = endNodeSet.iterator(); iterator.hasNext();) {
}
}
- System.out.println("newStartNodeSet=" + newStartNodeSet);
+ // System.out.println("newStartNodeSet=" + newStartNodeSet);
if (newStartNodeSet.size() == 0) {
newStartNodeSet.add(startNode);
private HNode getDirectlyReachableNodeFromStartNodeReachToEndNode(HierarchyGraph scGraph,
HNode startNode, HNode endNode) {
- System.out.println("getDirectlyReachableNodeFromStartNodeReachToEndNode start=" + startNode
- + " end=" + 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);
+ // System.out.println("connected=" + connected);
return connected.iterator().next();
}
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++);
}
String locName = mapIntermediateLoc.get(item);
- HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc);
+ HierarchyGraph simpleHierarchyGraph = infer.getSimpleHierarchyGraph(desc);
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 = graph.getDescSetOfNode(curNode);
+ 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("-TripleItem normal=" + item);
System.out.println("-curNode=" + curNode.getName() + " S=" + curNode.isSharedNode()
- + " locName=" + locName);
+ + " locName=" + locName + " isC=" + curNode.isCombinationNode());
- Set<HNode> outSet = graph.getOutgoingNodeSet(curNode);
+ 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)) {
- expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode);
+ if (needToExpandCombinationNode(desc, outNode)) {
+ System.out.println("NEED TO");
+ expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode);
+ } else {
+ System.out.println("NOT NEED TO");
+ }
}
+
}
}
// return;
// }
- HierarchyGraph graph = infer.getSimpleHierarchyGraph(desc);
+ HierarchyGraph simpleHierarchyGraph = infer.getSimpleHierarchyGraph(desc);
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 = graph.getDescSetOfNode(curNode);
+ Set<Descriptor> descSet = simpleHierarchyGraph.getDescSetOfNode(curNode);
for (Iterator iterator = descSet.iterator(); iterator.hasNext();) {
Descriptor d = (Descriptor) iterator.next();
locSummary.addMapHNodeNameToLocationName(d.getSymbol(), locName);
System.out.println("-curNode=" + curNode.getName() + " S=" + curNode.isSharedNode()
+ " locName=" + locName);
- 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));
+ 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 (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))) {
- visited.add(outNode);
- recurDFS(desc, lattice, combinationNodeInSCGraph, endNodeSet, visited,
- mapIntermediateLoc, idx + 1, locSummary, 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 {
- expandCombinationNode(desc, lattice, visited, mapIntermediateLoc, locSummary, outNode);
+ 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,
Map<Set<Integer>, String> mapF2LocName, Set<Integer> F) {
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