works

src/includes/aggregate_tests.h

@@ -6,15 +6,12 @@
 #include <iostream>
 
 
-std::vector<int> sizes = {
+vector<int> sizes = {
     50000, 100000, 150000, 200000, 250000, 300000, 350000, 400000, 500000, 
     600000, 700000, 800000, 900000, 1000000,
     2000000, 3000000, 4000000, 5000000, 6000000, 7000000, 8000000, 9000000, 10000000,
-    15000000, 20000000, 25000000, 30000000, 35000000, 
-    40000000, 45000000, 50000000
+    // 15000000, 20000000, 25000000, 30000000, 35000000, 40000000, 45000000, 50000000
 };
-
-
 // to print type info
 
 template <typename T>
@@ -47,113 +44,61 @@ std::basic_string_view<char> name(T var){
 
 
 template<class T>
-int int_test(T map, int repeats=30){
-    std::cout << "\t\t" << name(map) << "int tests \n";
+void int_test_aggregate(T map, int runs){
     std::ofstream output{"results.csv", std::ios_base::app};
-    // insert int tests
-    for (int i = 0; i < repeats; ++i){
-        std::string resultline = "insert_int, '" + std::string{name(map)} + "', ";
-        for (auto size: sizes){
-            float result = insert_int_test(size, T{}).count();
-            resultline += std::to_string(result);
-            resultline += ", ";
-        }
-        output << resultline << "\n";
-    }
-    std::cout << "insert int test done\n";
+    for (int i = 0; i < runs; ++i);
+        string insert = "\nint_insert, '";
+        string succ_lookup = "\nint_succ_lookup, '";
+        string nosucc_lookup = "\nint_nosucc_lookup, '";
+        string delet = "\nint_delete, '";
 
-    // lookup int
-        for (int i = 0; i < repeats; ++i){
-        std::string resultline = "lookup_int, '" + std::string{name(map)} + "', ";
-        for (auto size: sizes){
-            float result = lookup_int_test(size, T{}).count();
-            resultline += std::to_string(result);
-            resultline += ", ";
+        insert += string{name(map)} + "'"; 
+        succ_lookup += string{name(map)} + "'" ;
+        nosucc_lookup += string{name(map)} +"'" ;
+        delet += string{name(map)} + "'" ;
+        for ( auto size : sizes){
+            vector<float> results = int_test(map, size);
+            
+            insert += ", " + std::to_string(results[0]);
+            succ_lookup += ", " + std::to_string(results[1]);
+            nosucc_lookup +=", " + std::to_string(results[2]);
+            delet += ", " + std::to_string(results[3]);
         }
-        output << resultline << "\n";
-    }
-    std::cout << "lookup int test done\n";
-    // unsuccesful lookup
-    for (int i = 0; i < repeats; ++i){
-    std::string resultline = "nolookup_int, '" + std::string{name(map)} + "', ";
-    for (auto size: sizes){
-        float result = nolookup_int_test(size, T{}).count();
-        resultline += std::to_string(result);
-        resultline += ", ";
-        }
-    output << resultline << "\n";
-    }
-    std::cout << "unsuccesful lookup int test done\n";
-
-    // deletion
-    for (int i = 0; i < repeats; ++i){
-    std::string resultline = "delete_int, '" + std::string{name(map)} + "', ";
-    for (auto size: sizes){
-        float result = delete_int_test(size, T{}).count();
-        resultline += std::to_string(result);
-        resultline += ", ";
-        }
-    output << resultline << "\n";
-    }
-    std::cout << "deletion int test done\n";
-    return 0;
+        output << insert << succ_lookup << nosucc_lookup  << delet;
+        cout << insert << succ_lookup << nosucc_lookup  << delet;
+        
 }
 
 
+
 template<class T>
-int string_test(T map, int repeats=30){
-    std::cout <<"\t\t" << name(map) << " stringtest \n";
+void string_test_aggregate(T map, int runs){
     std::ofstream output{"results.csv", std::ios_base::app};
-    // insert int tests
-    for (int i = 0; i < repeats; ++i){
-        std::string resultline = "insert_string, '" + std::string{name(map)} + "', ";
-        for (auto size: sizes){
-            float result = insert_string_test(size, T{}).count();
-            resultline += std::to_string(result);
-            resultline += ", ";
-        }
-        output << resultline << "\n";
-    }
-    std::cout << "insert string test done\n";
+    for (int i = 0; i < runs; ++i);
+        string insert = "\nint_insert, '";
+        string succ_lookup = "\nint_succ_lookup, '";
+        string nosucc_lookup = "\nint_nosucc_lookup, '";
+        string delet = "\nint_delete, '";
 
-    // lookup int
-        for (int i = 0; i < repeats; ++i){
-        std::string resultline = "lookup_string, '" + std::string{name(map)} + "', ";
-        for (auto size: sizes){
-            float result = lookup_string_test(size, T{}).count();
-            resultline += std::to_string(result);
-            resultline += ", ";
+        insert += string{name(map)} + "'"; 
+        succ_lookup += string{name(map)} + "'" ;
+        nosucc_lookup += string{name(map)} +"'" ;
+        delet += string{name(map)} + "'" ;
+        for ( auto size : sizes){
+            vector<float> results = string_test(map, size);
+            
+            insert += ", " + std::to_string(results[0]);
+            succ_lookup += ", " + std::to_string(results[1]);
+            nosucc_lookup +=", " + std::to_string(results[2]);
+            delet += ", " + std::to_string(results[3]);
         }
-        output << resultline << "\n";
-    }
-    std::cout << "lookup string test done\n";
-    // unsuccesful lookup
-    for (int i = 0; i < repeats; ++i){
-    std::string resultline = "nolookup_string, '" + std::string{name(map)} + "', ";
-    for (auto size: sizes){
-        float result = nolookup_string_test(size, T{}).count();
-        resultline += std::to_string(result);
-        resultline += ", ";
-        }
-    output << resultline << "\n";
-    }
-    std::cout << "unsuccesful lookup string test done\n";
-    // deletion
-    for (int i = 0; i < repeats; ++i){
-    std::string resultline = "delete_string, '" + std::string{name(map)} + "', ";
-    for (auto size: sizes){
-        float result = delete_string_test(size, T{}).count();
-        resultline += std::to_string(result);
-        resultline += ", ";
-        }
-    output << resultline << "\n";
-    }
-    std::cout << "deletion string test done\n";
-
-
-    return 0;
+        output << insert << succ_lookup << nosucc_lookup  << delet;
+        cout << insert << succ_lookup << nosucc_lookup  << delet;
+        
+        
 }
 
 
 
+
 #endif