From 53ae8bb91319fe7c676d7e6e3ed7ae71dd4b6c9b Mon Sep 17 00:00:00 2001
From: yrutschle <git1@rutschle.net>
Date: Sat, 9 Apr 2022 13:22:55 +0200
Subject: [PATCH] remove floor entirely

---
 hash.c                                   |  14 +-------------
 hashtest/delete.tst.ref                  |   2 +-
 hashtest/delete_at_end.tst.ref           |   2 +-
 hashtest/delete_below_floor.tst.ref      |   2 +-
 hashtest/delete_discont.tst.ref          |   2 +-
 hashtest/delete_empty.tst.ref            |   2 +-
 hashtest/delete_full.tst.ref             |   2 +-
 hashtest/delete_middle.tst.ref           |   2 +-
 hashtest/delete_wrap.tst.ref             |   2 +-
 hashtest/delete_wrap_at_end.tst.ref      |   2 +-
 hashtest/delete_wrap_below_floor.tst.ref |   2 +-
 hashtest/delete_wrap_discont.tst.ref     |   2 +-
 hashtest/htest                           | Bin 24992 -> 24992 bytes
 hashtest/insert.tst.ref                  |   2 +-
 hashtest/insert_discont.tst.ref          |   2 +-
 hashtest/insert_full.tst.ref             |   2 +-
 hashtest/insert_full_floor.tst.ref       |   2 +-
 hashtest/insert_wrap.tst.ref             |   2 +-
 18 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/hash.c b/hash.c
index 2de8bf4..d3b9759 100644
--- a/hash.c
+++ b/hash.c
@@ -52,7 +52,6 @@ static void* const FREE = NULL;
 
 struct hash {
     int item_cnt;       /* Number of items in the hash */
-    int floor;          /* Where is the highest key. Or the lowest insert point */
     gap_array* data;
 
     hash_make_key_fn hash_make_key;
@@ -74,7 +73,6 @@ hash* hash_init(hash_make_key_fn make_key, hash_cmp_item_fn cmp_item)
     if (!h) return NULL;
 
     h->item_cnt = 0;
-    h->floor = 0;
     h->data = gap_init(hash_size);
     h->hash_make_key = make_key;
     h->cmp_item = cmp_item;
@@ -98,8 +96,6 @@ static int hash_find_index(hash* h, hash_item item)
     int index = hash_make_key(h, item);
     int cnt = 0;
 
-    if (index < h->floor) index = h->floor;
-
     cnx = gap_get(h->data, index);
 #ifdef DEBUG
     fprintf(stderr, "searching %d\n", index);
@@ -161,8 +157,6 @@ int hash_insert(hash* h, hash_item new)
 
         index = hash_next_index(h, index);
         curr_item = gap_get(hash, index);
-
-        if (index == 0) h->floor++;
     }
 
 #if DEBUG
@@ -182,14 +176,11 @@ int hash_remove(hash* h, hash_item item)
     int index = hash_find_index(h, item);
     if (index == -1) return -1; /* Tried to remove something that isn't there */
 
-    int lower_floor = 0; /* If we remove something below the floor, we'll need to lower it */
     while (1) {
-        if (index < h->floor) lower_floor = 1;
         int next_index = hash_next_index(h, index);
         hash_item next = gap_get(h->data, next_index);
         if ((next == FREE) || (distance(next_index, h, next) == 0)) {
             h->item_cnt--;
-            if (lower_floor) h->floor--;
             gap_set(hash, index, FREE);
             return 0;
         }
@@ -197,9 +188,6 @@ int hash_remove(hash* h, hash_item item)
         gap_set(hash, index, next);
 
         index = hash_next_index(h, index);;
-#if DEBUG
-        fprintf(stderr, "index %d floor %d\n", index, h->floor);
-#endif
     }
     return 0;
 }
@@ -222,7 +210,7 @@ void hash_dump(hash* h, char* filename)
         exit(1);
     }
     
-    fprintf(out, "<hash floor=%d elem=%d>\n", h->floor, h->item_cnt);
+    fprintf(out, "<hash elem=%d>\n", h->item_cnt);
     for (int i = 0; i < hash_size; i++) {
         hash_item item = gap_get(h->data, i);
         int idx = 0;
diff --git a/hashtest/delete.tst.ref b/hashtest/delete.tst.ref
index a95a3dc..ca930bb 100644
--- a/hashtest/delete.tst.ref
+++ b/hashtest/delete.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=0 elem=4>
+<hash elem=4>
 	0:0:
 	1:0:
 	2:0:
diff --git a/hashtest/delete_at_end.tst.ref b/hashtest/delete_at_end.tst.ref
index b883c40..c9ba1e5 100644
--- a/hashtest/delete_at_end.tst.ref
+++ b/hashtest/delete_at_end.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=0 elem=4>
+<hash elem=4>
 	0:0:
 	1:0:
 	2:0:
diff --git a/hashtest/delete_below_floor.tst.ref b/hashtest/delete_below_floor.tst.ref
index e20cf3a..d256c1f 100644
--- a/hashtest/delete_below_floor.tst.ref
+++ b/hashtest/delete_below_floor.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=1 elem=5>
+<hash elem=5>
 	0:30:ad
 	1:0:
 	2:2:ba
diff --git a/hashtest/delete_discont.tst.ref b/hashtest/delete_discont.tst.ref
index 07230ec..18b76f8 100644
--- a/hashtest/delete_discont.tst.ref
+++ b/hashtest/delete_discont.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=0 elem=4>
+<hash elem=4>
 	0:0:
 	1:0:
 	2:0:
diff --git a/hashtest/delete_empty.tst.ref b/hashtest/delete_empty.tst.ref
index e51b8b1..c7539cf 100644
--- a/hashtest/delete_empty.tst.ref
+++ b/hashtest/delete_empty.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=0 elem=0>
+<hash elem=0>
 	0:0:
 	1:0:
 	2:0:
diff --git a/hashtest/delete_full.tst.ref b/hashtest/delete_full.tst.ref
index 7dd0dea..3cc373a 100644
--- a/hashtest/delete_full.tst.ref
+++ b/hashtest/delete_full.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=0 elem=31>
+<hash elem=31>
 	0:0:aa
 	1:1:ab
 	2:2:ac
diff --git a/hashtest/delete_middle.tst.ref b/hashtest/delete_middle.tst.ref
index 9484187..1d27ad8 100644
--- a/hashtest/delete_middle.tst.ref
+++ b/hashtest/delete_middle.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=0 elem=4>
+<hash elem=4>
 	0:0:
 	1:0:
 	2:0:
diff --git a/hashtest/delete_wrap.tst.ref b/hashtest/delete_wrap.tst.ref
index 8cddd01..aabc8bd 100644
--- a/hashtest/delete_wrap.tst.ref
+++ b/hashtest/delete_wrap.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=2 elem=4>
+<hash elem=4>
 	0:30:ba
 	1:30:bb
 	2:0:
diff --git a/hashtest/delete_wrap_at_end.tst.ref b/hashtest/delete_wrap_at_end.tst.ref
index 73ea879..aa6683a 100644
--- a/hashtest/delete_wrap_at_end.tst.ref
+++ b/hashtest/delete_wrap_at_end.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=1 elem=5>
+<hash elem=5>
 	0:30:ac
 	1:1:ad
 	2:0:
diff --git a/hashtest/delete_wrap_below_floor.tst.ref b/hashtest/delete_wrap_below_floor.tst.ref
index e94683e..c47ff54 100644
--- a/hashtest/delete_wrap_below_floor.tst.ref
+++ b/hashtest/delete_wrap_below_floor.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=1 elem=3>
+<hash elem=3>
 	0:30:ad
 	1:0:
 	2:0:
diff --git a/hashtest/delete_wrap_discont.tst.ref b/hashtest/delete_wrap_discont.tst.ref
index 83873da..d734495 100644
--- a/hashtest/delete_wrap_discont.tst.ref
+++ b/hashtest/delete_wrap_discont.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=1 elem=5>
+<hash elem=5>
 	0:31:ad
 	1:0:
 	2:2:ba
diff --git a/hashtest/htest b/hashtest/htest
index e31a42712469918e80e69ff3bebe67ba1b97660a..aa2447526547353ea416ba87418fc12ae95593e5 100755
GIT binary patch
delta 2124
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
K>U^)kVfr5)uiD%I

delta 2290
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
Y?atp5e`sCSo<eKmBEB*3<B-SxKbzbc#sB~S

diff --git a/hashtest/insert.tst.ref b/hashtest/insert.tst.ref
index 2f39456..2f3efc9 100644
--- a/hashtest/insert.tst.ref
+++ b/hashtest/insert.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=0 elem=5>
+<hash elem=5>
 	0:0:
 	1:0:
 	2:0:
diff --git a/hashtest/insert_discont.tst.ref b/hashtest/insert_discont.tst.ref
index 6b376a2..bef2a57 100644
--- a/hashtest/insert_discont.tst.ref
+++ b/hashtest/insert_discont.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=0 elem=5>
+<hash elem=5>
 	0:0:
 	1:0:
 	2:0:
diff --git a/hashtest/insert_full.tst.ref b/hashtest/insert_full.tst.ref
index fef3d55..fc6e827 100644
--- a/hashtest/insert_full.tst.ref
+++ b/hashtest/insert_full.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=0 elem=32>
+<hash elem=32>
 	0:0:aa
 	1:1:ab
 	2:2:ac
diff --git a/hashtest/insert_full_floor.tst.ref b/hashtest/insert_full_floor.tst.ref
index 8c3b321..3823346 100644
--- a/hashtest/insert_full_floor.tst.ref
+++ b/hashtest/insert_full_floor.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=2 elem=6>
+<hash elem=6>
 	0:30:ac
 	1:30:ad
 	2:2:ba
diff --git a/hashtest/insert_wrap.tst.ref b/hashtest/insert_wrap.tst.ref
index 7138081..6ccb959 100644
--- a/hashtest/insert_wrap.tst.ref
+++ b/hashtest/insert_wrap.tst.ref
@@ -1,4 +1,4 @@
-<hash floor=2 elem=6>
+<hash elem=6>
 	0:30:ac
 	1:30:ad
 	2:0:ba