added remove() method to FastSet

[sbp.git] / src / edu / berkeley / sbp / util / FastSet.java

diff --git a/src/edu/berkeley/sbp/util/FastSet.java b/src/edu/berkeley/sbp/util/FastSet.java
index 086f636..711c984 100644 (file)
--- a/src/edu/berkeley/sbp/util/FastSet.java
+++ b/src/edu/berkeley/sbp/util/FastSet.java
@@ -1,13 +1,15 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp.util;
 import java.util.*;
 
-public /*final*/ class FastSet<T> implements Iterator<T>, Iterable<T> {
+public /*final*/ class FastSet<T> implements Iterator<T>, Iterable<T>, Visitable<T> {
 
-    public static final int INITIAL_SIZE = 128;
+    public static final int INITIAL_SIZE = 8;
 
-    private       Object[] array;
+    private       Object[] array = null;
     private       T        only  = null;
-    private       int      i     = 0;
+    private       int      i     = -1;
     private       int      size  = 0;
 
     public Iterator<T> iterator() { i=0; return this; }
@@ -28,6 +30,25 @@ public /*final*/ class FastSet<T> implements Iterator<T>, Iterable<T> {
         for(T t : s) array[size++] = t;
     }
 
+    public void remove(T t) {
+        if (only != null) {
+            if (only==t) only=null;
+            return;
+        }
+        boolean found = false;
+        for(int j=0; j<size; j++) {
+            if (array[j]==t) found = true;
+            if (found && j<size-1) array[j] = array[j+1];
+        }
+        if (found) size--;
+    }
+
+    public <B,C> void visit(Invokable<T,B,C> ivbc, B b, C c) {
+        if (only!=null) ivbc.invoke(only, b, c);
+        else for(int j=0; j<size; j++)
+            ivbc.invoke((T)array[j], b, c);
+    }
+
     public int size() { return only==null ? size : 1; }
     private void grow() {
         Object[] array2 = array==null ? new Object[INITIAL_SIZE] : new Object[array.length * 2];
@@ -39,7 +60,13 @@ public /*final*/ class FastSet<T> implements Iterator<T>, Iterable<T> {
         }
     }
     public void add(T t, boolean check) {
-        if (check) for(Object o : this) if (o.equals(t)) return;
+        //if (check) for(Object o : this) if (o.equals(t)) return;
+        if (check) {
+            if (only==t) return;
+            if (array != null)
+                for(int i=0; i<size; i++)
+                    if (array[i]==t) return;
+        }
         add(t);
     }
     public void add(T t) {