Updates to the testing code. Also added a Skip List Map implementation.

git-svn-id: https://java-algorithms-implementation.googlecode.com/svn/trunk@427 032fbc0f-8cab-eb90-e552-f08422b9a96a

Author: phishman3579

src/com/jwetherell/algorithms/DataStructures.java

@@ -282,7 +282,7 @@ protected Node<T> getLeast(Node<T> startingNode) {
     @Override
     public T remove(T value) {
         Node<T> nodeToRemove = this.removeValue(value);
-        return ((nodeToRemove!=null)?nodeToRemove.id:null);
+        return ((nodeToRemove!=null)?value:null);
     }
 
     /**

src/com/jwetherell/algorithms/data_structures/BinarySearchTree.java

@@ -42,17 +42,21 @@ public HashMap() {
      */
     @Override
     public V put(K key, V value) {
-        V prev = null;
+        V prev = value;
         int hashedKey = hashingFunction(key);
         List<Pair<K, V>> list = array[hashedKey];
+        boolean exist = false;
         // Do not add duplicates
         for (Pair<K, V> p : list) {
             if (p.key.equals(key)) {
                 prev = p.value;
                 p.value = value;
+                exist = true;
+                break;
             }
         }
-        list.add(new Pair<K, V>(key, value));
+        if (!exist) 
+            list.add(new Pair<K, V>(key, value));
         size++;
         return prev;
     }

src/com/jwetherell/algorithms/data_structures/HashMap.java

@@ -151,14 +151,27 @@ public boolean contains(T value) {
          */
         @Override
         public boolean validate() {
+            if (size()==0) return true;
+
             int localSize = 0;
+            int realFirst = firstIndex;
+            if (firstIndex>array.length) 
+                realFirst = firstIndex%array.length;
+            int realLast = lastIndex;
+            if (lastIndex>array.length) 
+                realLast = lastIndex%array.length;
             for (int i=0; i<array.length; i++) {
                 T t = array[i];
-                if (i<size()) {
-                    if (t==null) return false;
+                if ((realFirst==realLast) || 
+                    (realFirst<realLast && (i>=realFirst && i<realLast)) || 
+                    (realLast<realFirst && (i<realLast || i>=realFirst))
+                ) {
+                    if (t==null)
+                        return false;
                     localSize++;
                 } else {
-                    if (t!=null) return false;
+                    if (t!=null)
+                        return false;
                 }
             }
             return (localSize==size());

src/com/jwetherell/algorithms/data_structures/Queue.java

@@ -31,12 +31,12 @@ public RadixTrie() {
      */
     @Override
     public V put(K key, V value) {
-        V prev = null;
+        V prev = value;
         PatriciaTrie.Node node = trie.addSequence(key);
 
         if (node!=null && node instanceof RadixNode) {
             RadixNode<K,V> radixNode = (RadixNode<K,V>) node;
-            prev = radixNode.value;
+            if (radixNode.value!=null) prev = radixNode.value;
             radixNode.value = value;
         }