From: adam <adam@megacz.com>
Date: Tue, 4 Mar 2008 04:06:52 +0000 (-0500)
Subject: optimizations to FastSet: make it final again, don't shift the contents of the entire... 
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=f8ca178d9499b54477ab35046d7155b758be0e80

optimizations to FastSet: make it final again, don't shift the contents of the entire array

darcs-hash:20080304040652-5007d-c684bcc1dcca5f98a8cd8122314a3633157e7bd4.gz
---

diff --git a/src/edu/berkeley/sbp/util/FastSet.java b/src/edu/berkeley/sbp/util/FastSet.java
index 581886e..289e5ec 100644
--- a/src/edu/berkeley/sbp/util/FastSet.java
+++ b/src/edu/berkeley/sbp/util/FastSet.java
@@ -3,7 +3,7 @@
 package edu.berkeley.sbp.util;
 import java.util.*;
 
-public /*final*/ class FastSet<T> implements Iterator<T>, Iterable<T>, Visitable<T> {
+public final class FastSet<T> implements Iterator<T>, Iterable<T>, Visitable<T> {
 
     public static final int INITIAL_SIZE = 8;
 
@@ -42,11 +42,16 @@ public /*final*/ class FastSet<T> implements Iterator<T>, Iterable<T>, Visitable
             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--;
+        int j;
+        for(j=0; j<size; j++)
+            if (array[j]==t) {
+                found = true;
+                break;
+            }
+        if (!found) return;
+        array[j] = array[size-1];
+        array[size-1] = null;
+        size--;
     }
 
     public <B,C> void visit(Invokable<T,B,C> ivbc, B b, C c) {