rename

benaich · benaich · commit b4f8aecbd641 · 2015-01-03T10:35:22.000Z
diff --git a/HashTable/LinearProbing/HashTableLP.java b/HashTable/LinearProbing/HashTableLP.java
@@ -1,10 +1,9 @@
 package HashTable.LinearProbing;
 
 import HashTable.HashTableInterface;
-import java.util.Random;
 import java.util.function.Function;
 
-public class HashTable<K, V> implements HashTableInterface<K, V> {
+public class HashTableLP<K, V> implements HashTableInterface<K, V> {
 
     private Node[] array;
     private Function<K, Integer> foh;
@@ -13,12 +12,12 @@ public class HashTable<K, V> implements HashTableInterface<K, V> {
     private static int numCollisions = 0;
     private static int numResizes = 0;
 
-    public HashTable() {
+    public HashTableLP() {
         array = new Node[INITIAL_TABLE_SIZE];
         foh = getHashingFunction();
     }
 
-    public HashTable(Function<K, Integer> f) {
+    public HashTableLP(Function<K, Integer> f) {
         array = new Node[INITIAL_TABLE_SIZE];
         foh = f;
     }
@@ -80,8 +79,7 @@ public void resize() {
         numResizes++;
         clear();
 
-        for (int i = 0; i < oldArray.length; i++) {
-            Node<K, V> node = oldArray[i];
+        for (Node<K, V> node : oldArray) {
             if (node != null) {
                 put(node.getKey(), node.getValue());
             }
@@ -132,7 +130,7 @@ public void printGraph() {
 
     public static void main(String[] args) {
 
-        HashTable<String, String> ht = new HashTable<>();
+        HashTableLP<String, String> ht = new HashTableLP<>();
         ht.put("banana", "yellow");
         ht.put("apple", "green");
         ht.put("android", "green");
@@ -151,13 +149,13 @@ public static void main(String[] args) {
         String deletedKey = "apple";
         System.out.println(deletedKey + " : i -> " + ht.indexOf(deletedKey) + " -> " + ht.get(deletedKey));
 
-        System.out.println("----------- Delete -----------");
+        System.out.println("----------- Delete " + deletedKey +" -----------");
         ht.delete(deletedKey);
         ht.printGraph();
         ht.printStatus();
 
         // Testing
-        HashTable<String, String> table = new HashTable<>();
+        HashTableLP<String, String> table = new HashTableLP<>();
         for (int i = 0; i < 100000; i++) {
             table.put(HashTableInterface.randomString(), HashTableInterface.randomString());
         }
diff --git a/HashTable/SeparateChaining/HashTableSC.java b/HashTable/SeparateChaining/HashTableSC.java
@@ -3,7 +3,7 @@
 import HashTable.HashTableInterface;
 import java.util.function.Function;
 
-public class HashTable<K, V> implements HashTableInterface<K, V> {
+public class HashTableSC<K, V> implements HashTableInterface<K, V> {
 
     private Node[] array;
     private Function<K, Integer> foh;
@@ -12,12 +12,12 @@ public class HashTable<K, V> implements HashTableInterface<K, V> {
     private int numCollisions = 0;
     private int numResizes = 0;
 
-    public HashTable() {
+    public HashTableSC() {
         array = new Node[tableSize];
         foh = getHashingFunction();
     }
 
-    public HashTable(Function<K, Integer> f) {
+    public HashTableSC(Function<K, Integer> f) {
         array = new Node[tableSize];
         foh = f;
     }
@@ -98,8 +98,7 @@ public void resize() {
         numResizes++;
         clear();
 
-        for (int i = 0; i < oldArray.length; i++) {
-            Node<K, V> node = oldArray[i];
+        for (Node<K, V> node : oldArray) {
             while (node != null) {
                 put(node.getKey(), node.getValue());
                 node = node.getNext();
@@ -160,7 +159,7 @@ public void printGraph() {
 
     public static void main(String[] args) {
 
-        HashTable<String, String> ht = new HashTable<>();
+        HashTableSC<String, String> ht = new HashTableSC<>();
         ht.put("banana", "yellow");
         ht.put("apple", "green");
         ht.put("android", "green");
@@ -186,7 +185,7 @@ public static void main(String[] args) {
         ht.printStatus();
         
         // Testing
-        HashTable<String, String> table = new HashTable<>();
+        HashTableSC<String, String> table = new HashTableSC<>();
         for (int i = 0; i < 100000; i++) {
             table.put(HashTableInterface.randomString(), HashTableInterface.randomString());
         }
