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) {
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);
+ 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 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;
+ // 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 {
- System.out.println(" #######hierarchyGraph.getSkeleteNodeSetReachTo(" + hNode + ")="
- + hierarchyGraph.getSkeleteNodeSetReachTo(hNode));
+ // 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();
}
- numNonSharedNodes = hierarchyGraph.countNonSharedNode(hNode, aboveSet);
+ // 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(" node=" + hNode + " above=" + aboveSet + " distance="
- + numNonSharedNodes + " SCNode=" + SCNode);
+ 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<String> outgoingElements = skeletonLattice.get(SCNode.getName());
- System.out.println(" SCNODE outgoing=" + outgoingElements);
+ 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, SCNode.getName(), outgoingElements, numNonSharedNodes,
- hNode.isSharedNode());
- System.out.println(" locName=" + 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="
+ 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) {
- return start;
+ 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_getNewLocation(lattice, start, endSet, dist, isShared);
+ return recur_getNewLocation2(lattice, start, endSet, dist, isShared);
}
- private String recur_getNewLocation(SSJavaLattice<String> lattice, String cur,
+ 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
+ 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)) {
+ 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();
}
// need to insert a new shared location
+ Set<String> newChildSet = new HashSet<String>();
+ newChildSet.addAll(connectedSet);
+
String newLocName = "ILOC" + (LocationInference.locSeed++);
- for (Iterator iterator = connectedSet.iterator(); iterator.hasNext();) {
+ for (Iterator iterator = newChildSet.iterator(); iterator.hasNext();) {
String outNode = (String) iterator.next();
lattice.put(newLocName, outNode);
}
- connectedSet.clear();
+ lattice.get(cur).clear();
lattice.put(cur, newLocName);
- System.out.println(" INSERT NEW SHARED NODE=" + newLocName + " above=" + cur
+ System.out.println(" INSERT NEW SHARED NODE=" + newLocName + " above=" + cur
+ " below=" + lattice.get(newLocName));
lattice.addSharedLoc(newLocName);
}
String next;
- if (connectedSet.equals(endSet)) {
+
+ 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("NEW RELATION=" + lattice.get(cur));
+
+ 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) {
-
- // 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);
+ return recur_getNewLocation2(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,
projects / IRC.git / blobdiff