bug fixes on the flow graph.

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

diff --git a/Robust/src/Analysis/SSJava/NodeTupleSet.java b/Robust/src/Analysis/SSJava/NodeTupleSet.java
index 30fb1fb852adbb4e2ec55d50976fafdb4c4be14f..eaa0e6e9ae74d51c555d3af6c418b88bcda09a17 100644 (file)
--- a/Robust/src/Analysis/SSJava/NodeTupleSet.java
+++ b/Robust/src/Analysis/SSJava/NodeTupleSet.java
@@ -1,49 +1,57 @@
 package Analysis.SSJava;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 
 import IR.Descriptor;
 
 public class NodeTupleSet {
 
-  private Set<NTuple<Descriptor>> set;
+  private List<NTuple<Descriptor>> list;
 
   public NodeTupleSet() {
-    set = new HashSet<NTuple<Descriptor>>();
+    list = new ArrayList<NTuple<Descriptor>>();
   }
 
   public void addTuple(NTuple<Descriptor> tuple) {
 
-    // need to add additional elements because we need to create edges even from
-    // the base
-    // for example, if we have input <a,b,c>, we need to add additional element
-    // <a,b> and <a> to the set
+    for (Iterator iterator = list.iterator(); iterator.hasNext();) {
+      NTuple<Descriptor> t = (NTuple<Descriptor>) iterator.next();
+      if (t.equals(tuple)) {
+        return;
+      }
+    }
 
-    // NTuple<Descriptor> cur = new NTuple<Descriptor>();
-    // for (int i = 0; i < tuple.size(); i++) {
-    // Descriptor d = tuple.get(i);
-    // cur.add(d);
-    // set.add(new NTuple<Descriptor>(cur));
-    // }
+    list.add(tuple);
+  }
 
-    set.add(tuple);
+  public void removeTuple(NTuple<Descriptor> tuple) {
+    list.remove(tuple);
   }
 
   public Iterator<NTuple<Descriptor>> iterator() {
-    return set.iterator();
+    return list.iterator();
   }
 
   public String toString() {
-    return set.toString();
+    return list.toString();
   }
 
   public Set<NTuple<Descriptor>> getSet() {
+    Set<NTuple<Descriptor>> set = new HashSet<NTuple<Descriptor>>();
+    set.addAll(list);
     return set;
   }
 
   public void addTupleSet(NodeTupleSet in) {
-    set.addAll(in.getSet());
+    if (in != null) {
+      for (Iterator iterator = in.iterator(); iterator.hasNext();) {
+        NTuple<Descriptor> inTuple = (NTuple<Descriptor>) iterator.next();
+        addTuple(inTuple);
+      }
+    }
   }
 }