this is the most up to date working #2

Merged
MassiveAtoms merged 26 commits from moretables into master 2020-04-17 16:47:27 +00:00
3 changed files with 6 additions and 39 deletions
Showing only changes of commit 78700c9408 - Show all commits

View File

@ -2,7 +2,7 @@
#include <unordered_map> #include <unordered_map>
#include <functional> #include <functional>
#include <fstream> #include <fstream>
#include <sparsehash/sparse_hash_map> // #include <sparsehash/sparse_hash_map>
#include "./src/includes/aggregate_tests.h" #include "./src/includes/aggregate_tests.h"

View File

@ -1,33 +0,0 @@
int_insert, 'std::unordered_map<int, int>', 554, 591, 503, 498, 512, 526, 560, 564, 580
int_succ_lookup, 'std::unordered_map<int, int>', 435, 292, 312, 334, 354, 362, 383, 398, 413
int_nosucc_lookup, 'std::unordered_map<int, int>', 1571, 1800, 2700, 3538, 4559, 567, 6292, 596, 606
int_delete, 'std::unordered_map<int, int>', 428, 415, 461, 500, 510, 557, 561, 605, 615
int_insert, 'std::unordered_map<int, int>', 629, 459, 527, 498, 562, 541, 558, 557, 557
int_succ_lookup, 'std::unordered_map<int, int>', 404, 288, 342, 336, 357, 376, 396, 388, 392
int_nosucc_lookup, 'std::unordered_map<int, int>', 1608, 2003, 2863, 3699, 4624, 576, 6560, 586, 599
int_delete, 'std::unordered_map<int, int>', 532, 482, 479, 538, 519, 588, 587, 582, 591
int_insert, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 636, 644, 667, 728, 737, 727, 752, 750, 749
int_succ_lookup, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 432, 457, 472, 504, 506, 505, 537, 530, 519
int_nosucc_lookup, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 1139, 1675, 2395, 2933, 3777, 650, 4953, 660, 661
int_delete, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 762, 616, 648, 697, 693, 699, 736, 715, 713
int_insert, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 706, 696, 865, 841, 689, 687, 716, 709, 721
int_succ_lookup, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 582, 485, 799, 685, 495, 500, 537, 534, 518
int_nosucc_lookup, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 1124, 1752, 3944, 3627, 3532, 601, 5333, 620, 628
int_delete, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 672, 632, 1036, 797, 691, 691, 819, 727, 722
int_insert, 'std::unordered_map<int, int>', 138, 358, 194, 221, 228, 236, 257, 263, 262
int_succ_lookup, 'std::unordered_map<int, int>', 65, 202, 94, 107, 135, 114, 121, 120, 122
int_nosucc_lookup, 'std::unordered_map<int, int>', 358, 1158, 1226, 1606, 2330, 250, 2889, 306, 263
int_delete, 'std::unordered_map<int, int>', 166, 304, 229, 263, 282, 290, 310, 330, 328
int_insert, 'std::unordered_map<int, int>', 87, 240, 248, 218, 228, 241, 259, 254, 264
int_succ_lookup, 'std::unordered_map<int, int>', 37, 196, 101, 107, 114, 137, 136, 125, 124
int_nosucc_lookup, 'std::unordered_map<int, int>', 233, 885, 1243, 1595, 2097, 241, 4238, 265, 267
int_delete, 'std::unordered_map<int, int>', 95, 228, 256, 270, 287, 310, 571, 303, 351
int_insert, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 591, 534, 307, 370, 382, 382, 399, 405, 409
int_succ_lookup, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 189, 225, 264, 285, 287, 291, 302, 301, 308
int_nosucc_lookup, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 568, 2173, 1793, 2297, 2845, 376, 3789, 388, 384
int_delete, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 243, 828, 342, 365, 373, 375, 388, 386, 394
int_insert, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 350, 290, 296, 501, 942, 349, 340, 346, 355
int_succ_lookup, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 180, 237, 249, 385, 476, 289, 283, 288, 291
int_nosucc_lookup, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 665, 1202, 1745, 3419, 4709, 321, 3521, 332, 350
int_delete, 'std::unordered_map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >', 246, 310, 322, 457, 1076, 353, 371, 373, 386
1 insert_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 407.000000 345.000000 325.000000 402.000000 475.000000 378.000000 476.000000 553.000000 369.000000
insert_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 407.000000 345.000000 325.000000 402.000000 475.000000 378.000000 476.000000 553.000000 369.000000
insert_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 226.000000 282.000000 294.000000 429.000000 332.000000 307.000000 483.000000 372.000000 382.000000
insert_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 248.000000 256.000000 288.000000 736.000000 518.000000 416.000000 559.000000 413.000000 531.000000
insert_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 587.000000 268.000000 376.000000 306.000000 330.000000 301.000000 484.000000 530.000000 408.000000
insert_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 222.000000 280.000000 320.000000 359.000000 319.000000 313.000000 389.000000 411.000000 429.000000
insert_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 237.000000 270.000000 432.000000 327.000000 322.000000 371.000000 462.000000 380.000000 398.000000
insert_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 378.000000 399.000000 374.000000 311.000000 319.000000 325.000000 375.000000 535.000000 387.000000
insert_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 212.000000 264.000000 295.000000 305.000000 325.000000 323.000000 385.000000 400.000000 388.000000
insert_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 205.000000 265.000000 292.000000 327.000000 390.000000 512.000000 379.000000 377.000000 433.000000
insert_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 273.000000 289.000000 296.000000 321.000000 319.000000 330.000000 410.000000 380.000000 397.000000
lookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 289.000000 370.000000 421.000000 383.000000 300.000000 300.000000 311.000000 309.000000 306.000000
lookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 197.000000 251.000000 275.000000 295.000000 298.000000 299.000000 307.000000 306.000000 313.000000
lookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 196.000000 261.000000 281.000000 470.000000 452.000000 436.000000 465.000000 377.000000 493.000000
lookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 293.000000 379.000000 281.000000 313.000000 303.000000 418.000000 356.000000 449.000000 408.000000
lookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 329.000000 436.000000 521.000000 419.000000 378.000000 401.000000 334.000000 316.000000 324.000000
lookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 192.000000 253.000000 273.000000 289.000000 335.000000 379.000000 451.000000 305.000000 310.000000
lookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 334.000000 392.000000 396.000000 390.000000 358.000000 539.000000 309.000000 384.000000 309.000000
lookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 195.000000 254.000000 318.000000 346.000000 421.000000 508.000000 300.000000 303.000000 351.000000
lookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 190.000000 253.000000 275.000000 284.000000 300.000000 297.000000 306.000000 310.000000 303.000000
lookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 199.000000 251.000000 424.000000 282.000000 411.000000 492.000000 316.000000 313.000000 339.000000
nolookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 553.000000 1172.000000 1701.000000 2099.000000 2720.000000 337.000000 3647.000000 371.000000 374.000000
nolookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 530.000000 1105.000000 1681.000000 2041.000000 2590.000000 382.000000 3663.000000 350.000000 415.000000
nolookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 516.000000 1125.000000 1650.000000 2003.000000 2577.000000 328.000000 3664.000000 353.000000 377.000000
nolookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 523.000000 1102.000000 1730.000000 2048.000000 2656.000000 329.000000 3696.000000 367.000000 384.000000
nolookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 554.000000 1127.000000 2172.000000 2053.000000 2628.000000 327.000000 3679.000000 354.000000 398.000000
nolookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 866.000000 1107.000000 1661.000000 2123.000000 4012.000000 495.000000 3656.000000 388.000000 386.000000
nolookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 545.000000 1110.000000 1670.000000 2016.000000 2584.000000 346.000000 3709.000000 380.000000 537.000000
nolookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 743.000000 1101.000000 1632.000000 2068.000000 2634.000000 453.000000 5471.000000 362.000000 374.000000
nolookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 520.000000 1111.000000 1642.000000 2019.000000 2634.000000 338.000000 3689.000000 362.000000 519.000000
nolookup_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 746.000000 1643.000000 1814.000000 2035.000000 2678.000000 363.000000 4307.000000 512.000000 383.000000
delete_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 418.000000 423.000000 486.000000 356.000000 465.000000 368.000000 390.000000 378.000000 395.000000
delete_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 242.000000 317.000000 342.000000 451.000000 366.000000 376.000000 383.000000 374.000000 455.000000
delete_string 'std::unordered_map<std::__cxx11::basic_string<char> std::__cxx11::basic_string<char> >' 239.000000 314.000000 340.000000 356.000000 359.000000 370.000000 376.000000 385.000000 389.000000

View File

@ -8,7 +8,7 @@
#include <chrono> #include <chrono>
// maps // maps
#include <sparsehash/sparse_hash_map> // #include <sparsehash/sparse_hash_map>
// own // own
#include "./generator.h" #include "./generator.h"
@ -29,10 +29,10 @@ void prepare(std::unordered_map<string, string>& map,int size){
return; return;
} }
void prepare(google::sparse_hash_map<int, int>& map, int size){ // void prepare(google::sparse_hash_map<int, int>& map, int size){
map.set_deleted_key(0); // map.set_deleted_key(0);
return; // return;
} // }
template <class T> template <class T>
vector<int> int_test(T testmap, int size){ vector<int> int_test(T testmap, int size){