From 7c326f3effd9977cb34e23d9cc9e9eb42ae3c789 Mon Sep 17 00:00:00 2001
From: tylo <tylo@norceresearch.no>
Date: Wed, 11 Mar 2020 10:47:54 +0100
Subject: Renamed cdef.h to cdefs.h including symbols inside.

---
 benchmark.cpp | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'benchmark.cpp')

diff --git a/benchmark.cpp b/benchmark.cpp
index ca65ce5a..30bf9d2c 100644
--- a/benchmark.cpp
+++ b/benchmark.cpp
@@ -1,10 +1,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
-#include "cmap.h"
-#include "cvector.h"
 #include "cstring.h"
-#include "hash_set.hpp"
+#include "cmap.h"
 #include <unordered_map>
 
 
@@ -21,31 +19,23 @@ int main()
     const size_t N = 10000000;
 
     printf("Starting\n");
-    //cmap_ii_reserve(&map, N * 1.7);
+    //cmap_ii_reserve(&map, N * 1.25);
     before = clock();
     fib1 = 0, fib2 = 1;
     for (size_t i = 0; i < N; ++i) {
         checksum += ++cmap_ii_put(&map, FIBONACCI_NEXT, i)->value;
     }
     difference = clock() - before;
-    printf("%llu Check: %f\n", checksum, 1.0 * difference / CLOCKS_PER_SEC);
+    printf("Check: %llu, size: %llu, time: %f\n", checksum, cmap_size(map), 1.0 * difference / CLOCKS_PER_SEC);
     cmap_ii_destroy(&map);
 
     std::unordered_map<int, int> map2;
+    //map2.reserve(N);
     before = clock();
     fib1 = 0, fib2 = 1; checksum = 0;
     for (size_t i = 0; i < N; ++i)
         checksum += ++(map2[FIBONACCI_NEXT] = i);
     difference = clock() - before;
-    printf("%llu Check: %f\n", checksum, 1.0 * difference / CLOCKS_PER_SEC);
+    printf("Check: %llu, size: %llu, time: %f\n", checksum, map2.size(), 1.0 * difference / CLOCKS_PER_SEC);
     map2.clear();
-    
-    emhash7::HashMap<int, int> map3;
-    //map3.reserve(N);
-    before = clock();
-    fib1 = 0, fib2 = 1; checksum = 0;
-    for (size_t i = 0; i < N; ++i)
-        checksum += ++(*map3.insert(FIBONACCI_NEXT, i).first).second;
-    difference = clock() - before;
-    printf("%llu Check: %f\n", checksum, 1.0 * difference / CLOCKS_PER_SEC);    
 }
\ No newline at end of file
-- 
cgit v1.2.3