From ba1dab69d15e31494f7d6db33ac014a8ae75ba66 Mon Sep 17 00:00:00 2001
From: Tyge Løvset <60263450+tylo-work@users.noreply.github.com>
Date: Fri, 13 Mar 2020 19:55:27 +0100
Subject: Updated

---
 benchmark.cpp | 58 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

(limited to 'benchmark.cpp')

diff --git a/benchmark.cpp b/benchmark.cpp
index 67a217cd..ebb3af2f 100644
--- a/benchmark.cpp
+++ b/benchmark.cpp
@@ -6,7 +6,7 @@
 #include <clib/cmap.h>
 
 
-declare_CMap(ii, int, int);
+declare_CMap(ii, int64_t, int64_t);
 declare_CVector_string(s);
 
 int main()
@@ -24,44 +24,46 @@ int main()
     before = clock();
     checksum = 0; erased = 0; get = 0;
     for (size_t i = 0; i < N; ++i) {
-		int rnd = rand();
-		int op = rand() >> 13;
-		switch (op) {
-		case 1:
-			checksum += ++cmap_ii_put(&map, rnd, i-1)->value;
-			break;
-		case 2:
-			if (cmap_size(map) > 0) erased += cmap_ii_erase(&map, rnd);
-			break;
-		case 3:
-			get += (cmap_ii_get(map, rnd) != NULL);
-			break;
-		}
+        int64_t rnd = rand();
+        int op = rand() >> 13;
+        switch (op) {
+        case 1:
+            checksum += ++cmap_ii_put(&map, rnd, i-1)->value;
+            break;
+        //case 0:
+        case 2:
+            if (cmap_size(map) > 0) erased += cmap_ii_erase(&map, rnd);
+            break;
+        case 3:
+            get += (cmap_ii_get(map, rnd) != NULL);
+            break;
+        }
     }
     difference = clock() - before;
     printf("CMap_ii: size: %llu, time: %f, sum: %llu, erased: %llu, get %llu\n", cmap_size(map), 1.0 * difference / CLOCKS_PER_SEC, checksum, erased, get);
     //c_foreach (i, cmap_ii, map) sum += cmap_ii_get(map, i.item->key)->value;
     cmap_ii_destroy(&map);
 
-    std::unordered_map<int, int> map2;
+    std::unordered_map<int64_t, int64_t> map2;
     //map2.reserve(N);
     srand(123);
     before = clock();
     checksum = 0; erased = 0; get = 0;
     for (size_t i = 0; i < N; ++i) {
-		int rnd = rand();
-		int op = rand() >> 13;
-		switch (op) {		
-		case 1:
-			checksum += ++(map2[rnd] = i-1);
-			break;
-		case 2:
-			if (map2.size() > 0) erased += map2.erase(rnd);
-			break;
-		case 3:
-			get += (map2.find(rnd) != map2.end());
-			break;
-		}
+        int64_t rnd = rand();
+        int op = rand() >> 13;
+        switch (op) {        
+        case 1:
+            checksum += ++(map2[rnd] = i-1);
+            break;
+        //case 0:
+        case 2:
+            if (map2.size() > 0) erased += map2.erase(rnd);
+            break;
+        case 3:
+            get += (map2.find(rnd) != map2.end());
+            break;
+        }
     }
     difference = clock() - before;
     printf("std::um: size: %llu, time: %f, sum: %llu, erased: %llu, get %llu\n", cmap_size(map), 1.0 * difference / CLOCKS_PER_SEC, checksum, erased, get);
-- 
cgit v1.2.3