rename

benaich · benaich · commit 9be3f0307474 · 2015-01-03T20:51:18.000Z
diff --git a/HashTable/Cuckoo/CuckooHashTable.java b/HashTable/Cuckoo/CuckooHashTable.java
@@ -66,6 +66,12 @@ public int indexOf(K key) {
         return -1;
     }
 
+    @Override
+    public boolean contains(K key) {
+        return indexOf(key) != -1;
+    }
+    
+    @Override
     public void put(K key, V val) {
         if (contains(key)) {
             return;
@@ -151,10 +157,6 @@ public void printStatus() {
         System.out.println("Numbre of rehashes : " + numRehashes);
     }
 
-    public boolean contains(K key) {
-        return indexOf(key) != -1;
-    }
-
     private void rehache(int newLength) {
         Node[][] oldArray = array;
         this.tableSize = HashTableInterface.nextPrime(newLength);
@@ -189,7 +191,6 @@ public static void main(String[] args) {
         ht.put("dexter", "red");
 
         ht.print();
-        ht.printStatus();
 
         System.out.println("----------- Get -----------");
         String deletedKey = "apple";
diff --git a/HashTable/HashTableInterface.java b/HashTable/HashTableInterface.java
@@ -11,25 +11,20 @@ public interface HashTableInterface<K, V> {
     public static final Random r = new Random();
     public static final String BLACK_CIRCLE = "\u25CF";
 
-    /* get the current load factor */
-    default float loadFactor() {
-        return getSize() / (float) getTableSize();
-    }
-
     /* get the position of key */
     int indexOf(K key);
+    
+    /* check whether the specified key exist in the hashtable */
+    boolean contains(K key);
 
     /* update or insert a new item to the hashtable */
     void put(K key, V val);
 
     /* get the value of the key*/
     V get(K key);
 
-    /* remove key */
+    /* remove the specified item */
     void delete(K key);
-    
-    /* check whether the specified key exist in the hashtable */
-    boolean contains(K key);
 
     /* remove all data from the hashtable */
     void clear();
@@ -48,6 +43,11 @@ default float loadFactor() {
 
     /* get the number of resizes */
     int getNumResizes();
+    
+    /* get the current load factor */
+    default float loadFactor() {
+        return getSize() / (float) getTableSize();
+    }
 
     /* print the table */
     void print();
diff --git a/HashTable/LinearProbing/LPHashTable.java b/HashTable/LinearProbing/LPHashTable.java
@@ -29,7 +29,7 @@ public int indexOf(K key) {
     
     @Override
     public boolean contains(K key) {
-        return indexOf(key) != -1;
+        return array[indexOf(key)] != null;
     }
 
     @Override
@@ -147,7 +147,6 @@ public static void main(String[] args) {
         ht.put("arya", "startk");
         ht.put("dexter", "red");
 
-        System.out.println("----------- Print -----------");
         ht.print();
 
         System.out.println("----------- Get -----------");
diff --git a/HashTable/SeparateChaining/SCHashTable.java b/HashTable/SeparateChaining/SCHashTable.java
@@ -29,7 +29,7 @@ public int indexOf(K key) {
     
     @Override
     public boolean contains(K key) {
-        return indexOf(key) != -1;
+        return array[indexOf(key)] != null;
     }
 
     @Override
@@ -176,14 +176,13 @@ public static void main(String[] args) {
         ht.put("arys", "startk");
         ht.put("dextr", "red");
 
-        System.out.println("----------- Print -----------");
         ht.print();
 
         System.out.println("----------- Get -----------");
         String deletedKey = "apple";
         System.out.println(deletedKey + " : i -> " + ht.indexOf(deletedKey) + " -> " + ht.get(deletedKey));
 
-        System.out.println("----------- Delete " + deletedKey +" -----------");
+        System.out.println("----------- Delete " + deletedKey + " -----------");
         ht.delete(deletedKey);
 
         ht.printGraph();
