tu-darmstadt-informatik/AuD18
1
0
Fork 0
mirror of https://github.com/tu-darmstadt-informatik/AuD18.git synced 2025-12-13 09:55:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add that one line that makes things actually work

Browse Source
This commit is contained in:
rec0de 2018-05-16 21:34:07 +02:00
parent 005bafeab2
commit 3e93faca5e
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
HashTable/src/lab/HashTable.java
View File

@ -6,7 +6,6 @@ import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.stream.Collectors;
import frame.Entry; import frame.Entry;
@ -51,7 +50,6 @@ public class HashTable {
this.probingMode = collisionResolution.equals("quadratic_probing") ? 1 : 0; this.probingMode = collisionResolution.equals("quadratic_probing") ? 1 : 0;
this.valueCount = 0; this.valueCount = 0;
this.capacity = k; this.capacity = k;
System.out.println("CONSTRUCTOR CALLED "+hashFunction+" "+collisionResolution);
} }
/** /**
@ -133,7 +131,7 @@ public class HashTable {
if(((double) this.valueCount) / this.capacity > 0.75) if(((double) this.valueCount) / this.capacity > 0.75)
this.rehash(); this.rehash();
// System.out.println("Load: "+Double.toString(((double) this.valueCount) / this.capacity)); //System.out.println("Load: "+Double.toString(((double) this.valueCount) / this.capacity));
return true; return true;
} }
@ -249,11 +247,6 @@ public class HashTable {
// Finally, add a closing bracket // Finally, add a closing bracket
dot.add("}"); dot.add("}");
// Dump dot code for debugging
System.out.println("BEGIN DATA DUMP");
System.out.println(this.capacity + (this.hashFunction == 1 ? " folding " : this.hashFunction == 2 ? " midSquare " : " division ")+(this.probingMode == 0 ? "linear" : "quadratic"));
System.out.println(dot.stream().collect(Collectors.joining("\n")));
System.out.println("END DATA DUMP");
return dot; return dot;
} }
@ -276,8 +269,6 @@ public class HashTable {
newSize -= 1; newSize -= 1;
} }
System.out.println("REHASH: "+newSize);
// Save old HashTable // Save old HashTable
int oldSize = this.capacity; int oldSize = this.capacity;
Entry[] oldData = this.data; Entry[] oldData = this.data;
@ -285,6 +276,7 @@ public class HashTable {
// Create new HashTable // Create new HashTable
this.data = new Entry[newSize]; this.data = new Entry[newSize];
this.capacity = newSize; this.capacity = newSize;
this.valueCount = 0; // I spent DAYS figuring out I missed this line. Turns out it _is_ important
// Loop over old table and insert all found values into the new table // Loop over old table and insert all found values into the new table
for(int i = 0; i < oldSize; i++) { for(int i = 0; i < oldSize; i++) {