Cleanup

1 files changed, 57 insertions, 4 deletions

diff --git a/benchmark.cpp b/benchmark.cpp
index d88a38fa..3f11703d 100644
--- a/benchmark.cpp
+++ b/benchmark.cpp
@@ -12,23 +12,61 @@ c_declare_Vector_string(s);
 int main()

 {

     c_Hashmap_ii map = c_hashmap_initializer;

+    int K = 300000;

+    printf("BEGIN\n");

+    //c_hashmap_ii_reserve(&map, 50);

+    /*

+    c_hashmap_ii_setMaxLoadFactor(&map, 0.8);

+    for (size_t i = 0; i < K; ++i) {

+        c_hashmap_ii_put(&map, i*i, i);

+    }

+    for (size_t i = 0; i < K/2; ++i) {

+        c_hashmap_ii_erase(&map, i*i);

+    }

+    c_foreach (i, c_hashmap_ii, map) c_hashmap_ii_bucket(map, i.item->key);

+    for (size_t i = 0; i < K/2; ++i) {

+        c_hashmap_ii_put(&map, i, i*i);

+    }    

+    c_foreach (i, c_hashmap_ii, map) c_hashmap_ii_bucket(map, i.item->key);

+    */

+    

     uint64_t checksum = 0;

     clock_t before, difference;

     size_t fib1, fib2, fibx;

     

     const size_t N = 10000000;

 

-    printf("Starting\n");

+    printf("Starting %llu\n", N);

     //c_hashmap_ii_reserve(&map, N * 1.25);

     before = clock();

-    fib1 = 0, fib2 = 1;

+    fib1 = 0, fib2 = 1; checksum = 0;

     for (size_t i = 0; i < N; ++i) {

         checksum += ++c_hashmap_ii_put(&map, FIBONACCI_NEXT, i)->value;

     }

     difference = clock() - before;

-    printf("Check: %llu, size: %llu, time: %f\n", checksum, c_hashmap_size(map), 1.0 * difference / CLOCKS_PER_SEC);

+    printf("c_Hashmap_ii added: size: %llu, time: %f, check: %llu\n", c_hashmap_size(map), 1.0 * difference / CLOCKS_PER_SEC, checksum);

+    before = clock();

+    fib1 = 0, fib2 = 1;

+    for (size_t i = 0; i < N*2/3; ++i) {

+        c_hashmap_ii_erase(&map, FIBONACCI_NEXT);

+    }

+    difference = clock() - before;

+    printf("c_Hashmap_ii removed: size: %llu, time: %f, check: %llu\n", c_hashmap_size(map), 1.0 * difference / CLOCKS_PER_SEC, checksum);

+

+    before = clock();

+    fib1 = 0, fib2 = 1; checksum = 0;

+    for (size_t i = 0; i < N; ++i) {

+        checksum += ++c_hashmap_ii_put(&map, i, i)->value;

+    }

+    difference = clock() - before;

+    printf("c_Hashmap_ii re-add: size: %llu, time: %f, check: %llu\n", c_hashmap_size(map), 1.0 * difference / CLOCKS_PER_SEC, checksum);

+    

+    size_t sum = 0;

+    c_foreach (i, c_hashmap_ii, map) sum += c_hashmap_ii_get(map, i.item->key)->value;

+    

     c_hashmap_ii_destroy(&map);

 

+

     std::unordered_map<int, int> map2;

     //map2.reserve(N);

     before = clock();

@@ -36,6 +74,21 @@ int main()
     for (size_t i = 0; i < N; ++i)

         checksum += ++(map2[FIBONACCI_NEXT] = i);

     difference = clock() - before;

-    printf("Check: %llu, size: %llu, time: %f\n", checksum, map2.size(), 1.0 * difference / CLOCKS_PER_SEC);

+    printf("std::unordered_map added: size: %llu, time: %f, check: %llu\n", map2.size(), 1.0 * difference / CLOCKS_PER_SEC, checksum);

+    

+    before = clock();

+    fib1 = 0, fib2 = 1; checksum = 0;

+    for (size_t i = 0; i < N*2/3; ++i)

+        map2.erase(FIBONACCI_NEXT);

+    difference = clock() - before;

+    printf("std::unordered_map erased: size: %llu, time: %f\n", map2.size(), 1.0 * difference / CLOCKS_PER_SEC);

+   

+    before = clock();

+    fib1 = 0, fib2 = 1; checksum = 0;

+    for (size_t i = 0; i < N; ++i)

+        checksum += ++(map2[i] = i);

+    difference = clock() - before;

+    printf("std::unordered_map re-add: size: %llu, time: %f, check: %llu\n", map2.size(), 1.0 * difference / CLOCKS_PER_SEC, checksum);

+    

     map2.clear();

 }
\ No newline at end of file