New jogamp.common.util.ArrayHashSet, providing O(1) queries/add and identity operations

3 files changed, 233 insertions, 19 deletions

diff --git a/src/junit/com/jogamp/common/util/TestArrayHashSet01.java b/src/junit/com/jogamp/common/util/TestArrayHashSet01.java
new file mode 100644
index 0000000..5486671
--- /dev/null
+++ b/src/junit/com/jogamp/common/util/TestArrayHashSet01.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+ 
+package com.jogamp.common.util;
+
+import java.util.*;
+import java.io.IOException;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.AfterClass;
+import org.junit.Test;
+
+public class TestArrayHashSet01 {
+
+    public static class Dummy {
+        int i1, i2, i3;
+
+        public Dummy(int i1, int i2, int i3) {
+            this.i1 = i1;
+            this.i2 = i2;
+            this.i3 = i3;
+        }
+
+        public boolean equals(Object o) {
+            if(o instanceof Dummy) {
+                Dummy d = (Dummy)o;
+                return this.i1 == d.i1 &&
+                       this.i2 == d.i2 &&
+                       this.i3 == d.i3 ;
+            }
+            return false;
+        }
+
+        public final int hashCode() {
+            // 31 * x == (x << 5) - x
+            int hash = 31 + i1;
+            hash = ((hash << 5) - hash) + i2;
+            hash = ((hash << 5) - hash) + i3;
+            return hash;
+        }
+
+        public String toString() {
+            return "Dummy["+super.toString()+": "+i1+", "+i2+", "+i3+"]";
+        }
+    }
+
+    public void populate(List l, int start, int len, int i2, int i3, int expectedPlusSize) {
+        int oldSize = l.size();
+        int pos = start+len-1;
+        while(pos>=start) {
+            l.add(new Dummy(pos--, i2, i3));
+        }
+        Assert.assertEquals(expectedPlusSize, l.size() - oldSize);
+    }
+
+    @Test
+    public void test01ArrayHashSet() {
+        int sum=0;
+        ArrayHashSet l = new ArrayHashSet();
+        populate(l, 10, 100, 22, 34, 100); // [10 .. 109]
+        populate(l, 10, 100, 22, 34,   0); // [10 .. 109]
+        populate(l,  6,   5, 22, 34,   4); // [ 6 .. 9], 10 already exists
+
+        Dummy p6_22_34 = new Dummy(6, 22, 34);
+
+        // slow get on position ..
+        int i = l.indexOf(p6_22_34);
+        Dummy q = (Dummy) l.get(i);
+        Assert.assertNotNull(q);
+        Assert.assertEquals(p6_22_34, q);
+        Assert.assertTrue(p6_22_34.hashCode() == q.hashCode());
+        Assert.assertTrue(p6_22_34 != q); // diff reference
+
+        // fast identity ..
+        q = (Dummy) l.get(p6_22_34);
+        Assert.assertNotNull(q);
+        Assert.assertEquals(p6_22_34, q);
+        Assert.assertTrue(p6_22_34.hashCode() == q.hashCode());
+        Assert.assertTrue(p6_22_34 != q); // diff reference
+
+        Assert.assertTrue(!l.add(q)); // add same
+        Assert.assertTrue(!l.add(p6_22_34)); // add equivalent
+    }
+
+    public static void main(String args[]) throws IOException {
+        String tstname = TestArrayHashSet01.class.getName();
+        org.junit.runner.JUnitCore.main(tstname);
+    }
+
+}
diff --git a/src/junit/com/jogamp/common/util/TestIteratorIndexCORE.java b/src/junit/com/jogamp/common/util/TestIteratorIndexCORE.java
new file mode 100644
index 0000000..0a3bd31
--- /dev/null
+++ b/src/junit/com/jogamp/common/util/TestIteratorIndexCORE.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+ 
+package com.jogamp.common.util;
+
+import java.util.*;
+import java.io.IOException;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.AfterClass;
+import org.junit.Test;
+
+public class TestIteratorIndexCORE {
+
+    static int elems = 10;
+    static int loop = 9999999;
+
+    public void populate(List l, int len) {
+        while(len>0) {
+            l.add(new Integer(len--));
+        }
+    }
+
+    @Test
+    public void test01ArrayListIterator() {
+        int sum=0;
+        ArrayList l = new ArrayList();
+        populate(l, elems);
+
+        for(int j=loop; j>0; j--) {
+            for(Iterator iter = l.iterator(); iter.hasNext(); ) {
+                Integer i = (Integer)iter.next();
+                sum+=i.intValue();
+            }
+        }
+        System.err.println("test01-arraylist-iterator sum: "+sum);
+    }
+
+    @Test
+    public void test0ArrayListIndex() {
+        int sum=0;
+        ArrayList l = new ArrayList();
+        populate(l, elems);
+
+        for(int j=loop; j>0; j--) {
+            for(int k = 0; k < l.size(); k++) {
+                Integer i = (Integer)l.get(k);
+                sum+=i.intValue();
+            }
+        }
+        System.err.println("test01-arraylist-index sum: "+sum);
+    }
+
+    @Test
+    public void test01LinkedListListIterator() {
+        int sum=0;
+        LinkedList l = new LinkedList();
+        populate(l, elems);
+
+        for(int j=loop; j>0; j--) {
+            for(Iterator iter = l.iterator(); iter.hasNext(); ) {
+                Integer i = (Integer)iter.next();
+                sum+=i.intValue();
+            }
+        }
+        System.err.println("test01-linkedlist-iterator sum: "+sum);
+    }
+
+    @Test
+    public void test01LinkedListListIndex() {
+        int sum=0;
+        LinkedList l = new LinkedList();
+        populate(l, elems);
+
+        for(int j=loop; j>0; j--) {
+            for(int k = 0; k < l.size(); k++) {
+                Integer i = (Integer)l.get(k);
+                sum+=i.intValue();
+            }
+        }
+        System.err.println("test01-linkedlist-index sum: "+sum);
+    }
+
+    public static void main(String args[]) throws IOException {
+        String tstname = TestIteratorIndexCORE.class.getName();
+        org.junit.runner.JUnitCore.main(tstname);
+    }
+
+}
diff --git a/src/junit/com/jogamp/common/util/locks/TestRecursiveLock01.java b/src/junit/com/jogamp/common/util/locks/TestRecursiveLock01.java
index e7560d9..ff3c4e0 100644
--- a/src/junit/com/jogamp/common/util/locks/TestRecursiveLock01.java
+++ b/src/junit/com/jogamp/common/util/locks/TestRecursiveLock01.java
@@ -254,26 +254,7 @@ public class TestRecursiveLock01 {
     }
 
     public static void main(String args[]) throws IOException {
-        /*for(int i=0; i<args.length; i++) {
-            if(args[i].equals("-time")) {
-                durationPerTest = atoi(args[++i]);
-            }
-        }
-        System.out.println("durationPerTest: "+durationPerTest);
-        */
         String tstname = TestRecursiveLock01.class.getName();
-        /*
-        org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(new String[] {
-            tstname,
-            "filtertrace=true",
-            "haltOnError=false",
-            "haltOnFailure=false",
-            "showoutput=true",
-            "outputtoformatters=true",
-            "logfailedtests=true",
-            "logtestlistenerevents=true",
-            "formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter",
-            "formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,TEST-"+tstname+".xml" } ); */
         org.junit.runner.JUnitCore.main(tstname);
     }