Added hashmap

tests/foreach.c

@@ -2,7 +2,7 @@
 #include <assert.h>
 #include "../src/macro_collections.h"
 
-int cmp(int a, int b)
+int intcmp(int a, int b)
 {
     return a - b;
 }
@@ -28,6 +28,7 @@ COLLECTION_GENERATE(HEAP, PUBLIC, h, heap, /**/, /**/, int)
 COLLECTION_GENERATE(TREESET, PUBLIC, ts, tset, /**/, /**/, int)
 COLLECTION_GENERATE(TREEMAP, PUBLIC, tm, tmap, /**/, int, int)
 COLLECTION_GENERATE(HASHSET, PUBLIC, hs, hset, /**/, /**/, int)
+COLLECTION_GENERATE(HASHMAP, PUBLIC, hm, hmap, /* FMOD */, int, int)
 
 int main(int argc, char const *argv[])
 {
@@ -36,10 +37,11 @@ int main(int argc, char const *argv[])
     queue *q = q_new(1000);
     deque *d = d_new(1000);
     linked *ll = ll_new();
-    heap *h = h_new(1000, MaxHeap, cmp);
-    tset *ts = ts_new(cmp);
-    tmap *tm = tm_new(cmp);
-    hset *hs = hs_new(1000, 0.9, cmp, inthash);
+    heap *h = h_new(1000, MaxHeap, intcmp);
+    tset *ts = ts_new(intcmp);
+    tmap *tm = tm_new(intcmp);
+    hset *hs = hs_new(1000, 0.9, intcmp, inthash);
+    hmap *hm = hm_new(1000, 0.9, intcmp, inthash);
 
     for (int i = 1; i < 10001; i++)
     {
@@ -62,9 +64,11 @@ int main(int argc, char const *argv[])
         ts_insert(ts, i);
         tm_insert(tm, i, i);
         hs_insert(hs, i);
+        hm_insert(hm, i, i);
     }
 
-    int sum0 = 0, sum1 = 0, sum2 = 0, sum3 = 0, sum4 = 0, sum5 = 0, sum6 = 0, sum7 = 0, sum8 = 0, sum9 = 0;
+    int sum0 = 0, sum1 = 0, sum2 = 0, sum3 = 0, sum4 = 0, sum5 = 0, sum6 = 0,
+        sum7 = 0, sum8 = 0, sum9 = 0, sum10 = 0, sum11 = 0;
 
     FOR_EACH(l, list, int, l, {
         sum0 += value;
@@ -103,6 +107,11 @@ int main(int argc, char const *argv[])
         sum9 += value;
     })
 
+    FOR_EACH_MAP(hm, hmap, int, int, hm, {
+        sum10 += key;
+        sum11 += value;
+    })
+
     if (sum0 == 50005000)
         printf("%10s PASSED\n", "LIST");
     if (sum1 == 50005000)
@@ -121,10 +130,13 @@ int main(int argc, char const *argv[])
         printf("%10s PASSED\n", "TREEMAP");
     if (sum9 == 50005000)
         printf("%10s PASSED\n", "HASHSET");
+    if (sum10 == 50005000 && sum11 == 50005000)
+        printf("%10s PASSED\n", "HASHMAP");
 
     printf("\n\n");
 
-    sum0 = 0, sum1 = 0, sum2 = 0, sum3 = 0, sum4 = 0, sum5 = 0, sum6 = 0, sum7 = 0, sum8 = 0, sum9 = 0;
+    sum0 = 0, sum1 = 0, sum2 = 0, sum3 = 0, sum4 = 0, sum5 = 0, sum6 = 0,
+    sum7 = 0, sum8 = 0, sum9 = 0, sum10 = 0, sum11 = 0;
 
     FOR_EACH_REV(l, list, int, l, {
         sum0 += value;
@@ -163,6 +175,11 @@ int main(int argc, char const *argv[])
         sum9 += value;
     })
 
+    FOR_EACH_MAP_REV(tm, tmap, int, int, tm, {
+        sum10 += key;
+        sum11 += value;
+    })
+
     if (sum0 == 50005000)
         printf("%10s PASSED\n", "LIST");
     if (sum1 == 50005000)
@@ -181,6 +198,8 @@ int main(int argc, char const *argv[])
         printf("%10s PASSED\n", "TREEMAP");
     if (sum9 == 50005000)
         printf("%10s PASSED\n", "HASHSET");
+    if (sum10 == 50005000 && sum11 == 50005000)
+        printf("%10s PASSED\n", "HASHMAP");
 
     l_free(l);
     ll_free(ll);

tests/iterators/hashmap.c

@@ -0,0 +1,71 @@
+// Checks if the hashmap iterator can go back and forward in the hashmap without
+// hitting invalid states or a null pointer. Check is done visually.
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include "../../src/hashmap.h"
+
+HASHMAP_GENERATE(hm, hmap, static, int, double)
+
+size_t inthash(int t)
+{
+    size_t a = t;
+    a += ~(a << 15);
+    a ^= (a >> 10);
+    a += (a << 3);
+    a ^= (a >> 6);
+    a += ~(a << 11);
+    a ^= (a >> 16);
+    return a;
+}
+
+int intcmp(int a, int b)
+{
+    return a - b;
+}
+
+int main(int argc, char const *argv[])
+{
+    size_t i;
+    int k;
+    double v, varr[10] = {0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9};
+
+    // Initialize hashmap and add some element
+    hmap *hm = hm_new(50, 0.9, intcmp, inthash);
+    for (int i = 0; i < 10; i++)
+        hm_insert(hm, i, varr[i]);
+
+    // Initialize iterator
+    hmap_iter iter;
+    hm_iter_new(&iter, hm);
+
+    // Make the iterator go back and forward
+    for (int j = 0; j < 4; j++)
+    {
+        while (hm_iter_next(&iter, &k, &v, &i))
+            printf("S[%2d] = { %2d : %2.2lf }\n", i, k, v);
+        printf("\n");
+        while (hm_iter_prev(&iter, &k, &v, &i))
+            printf("S[%2d] = { %2d : %2.2lf }\n", i, k, v);
+        printf("\n\n");
+    }
+
+    for (hm_iter_tostart(&iter); !hm_iter_end(&iter); /**/)
+    {
+        hm_iter_next(&iter, &k, &v, &i);
+        printf("M[%2d] = { %2d : %2.2lf }\n", i, k, v);
+    }
+
+    printf("\n");
+
+    for (hm_iter_toend(&iter); !hm_iter_start(&iter); /**/)
+    {
+        hm_iter_prev(&iter, &k, &v, &i);
+        printf("M[%2d] = { %2d : %2.2lf }\n", i, k, v);
+    }
+
+    hm_free(hm);
+
+    return 0;
+}