all fixed...

[IRC.git] / Robust / src / Analysis / SSJava / BuildLattice.java

diff --git a/Robust/src/Analysis/SSJava/BuildLattice.java b/Robust/src/Analysis/SSJava/BuildLattice.java
index aa8ac139b1088a51b35ac453b6fabc87bfb9a3fd..e24965e35b5916b223b07eb0083d555bfbbcabd0 100644 (file)
--- a/Robust/src/Analysis/SSJava/BuildLattice.java
+++ b/Robust/src/Analysis/SSJava/BuildLattice.java
@@ -315,11 +315,15 @@ public class BuildLattice {
             // 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;
+            // System.out.println("   hierarchyGraph.getSkeleteNodeSetReachTo(" + hNode + ")="
+            // + hierarchyGraph.getSkeleteNodeSetReachTo(hNode));
+
+            Set<HNode> reachToSet = hierarchyGraph.getSkeleteNodeSetReachTo(hNode);
+            for (Iterator iterator2 = reachToSet.iterator(); iterator2.hasNext();) {
+              HNode reachToNode = (HNode) iterator2.next();
+              aboveSet.add(scGraph.getCurrentHNode(reachToNode));
+            }
+
             SCNode = aboveSet.iterator().next();
           }
 
@@ -333,8 +337,8 @@ public class BuildLattice {
 
           trace = hierarchyGraph.computeDistance(hNode, endSet, combineSkeletonNodeSet);
 
-          System.out.println("   COUNT-RESULT::node=" + hNode + " above=" + endSet + " trace="
-              + trace + "   SCNode=" + SCNode);
+          System.out.println("   COUNT-RESULT::start=" + hNode + " end=" + endSet + " trace="
+              + trace);
         }
 
         // 3) convert the node m into a chain of nodes with the last node in the chain having m’s