diff --git a/benchmark/benchmarker.cpp b/benchmark/benchmarker.cpp
index 0e3dac93c909932224c151f0b5fed55fcad9b8c1..4dea4a94fdc406b6cb50283f0fbdabbaab958e5e 100644
--- a/benchmark/benchmarker.cpp
+++ b/benchmark/benchmarker.cpp
@@ -8,6 +8,7 @@
using namespace std;
#include "../src/util/timer.h"
+#include "generators.cpp"
//---------------------------
/**
@@ -78,143 +79,48 @@ double measure(const vector<int>&vec)
#endif
double sorted(int size)
-{
- vector<int> vec(size);
- iota(vec.begin(), vec.end(), 0);
-
- return measure(vec);
+{
+ return measure(generateSorted(size));
}
double random(int size)
{
- srand(size + 2021);
-
- vector<int> vec(size);
- generate(vec.begin(), vec.end(), [=](){return std::rand() % (2*size);});
-
- return measure(vec);
+ return measure(generateRandom(size));
}
double shuffle(int size)
{
- srand(size);
-
- vector<int> vec(size);
- iota(vec.begin(), vec.end(), 0);
- random_shuffle(vec.begin(), vec.end());
-
- return measure(vec);
+ return measure(generateShuffle(size));
}
double almostSorted(int size)
{
- vector<int> vec(size);
- iota(vec.begin(), vec.end(), 0);
- for(int i = 0; i < 3; i++) //swaps 3 times in array
- {
- int s = rand() % (size - 3);
- std::swap(vec[s], vec[s + 1]);
- }
-
- return measure(vec);
+ return measure(generateAlmostSorted(size));
}
double decreasing(int size)
{
- vector<int> vec(size);
- for(int i = 0; i < size; i++)
- vec[i] = size - i;
-
- return measure(vec);
+ return measure(generateDecreasing(size));
}
double zero_entropy(int size)
-{
- vector<int> vec(size);
- for(auto & x : vec)
- x = size;
-
- return measure(vec);
+{
+ return measure(generateZero_entropy(size));
}
double gaussian(int size)
{
- srand(size + 2000);
-
- vector<int> vec(size);
- for (int i = 0; i < size; ++i)
- {
- int value = 0;
- for (int j = 0; j < 4; ++j)
- value += rand()%16384;
-
- vec[i] = value /4;
- }
- return measure(vec);
+ return measure(generateZero_entropy(size));
}
double bucket(int size)
{
- srand (size + 94215);
- vector<int> vec(size);
-
- double tmp = ((double)size)*3000000; //(RAND_MAX)/p; --> ((double)N)*30000;
- double tmp2 = sqrt(tmp);
-
- int p= (size+tmp2-1)/tmp2;
-
- const int VALUE = 8192/p; //(RAND_MAX)/p;
-
- int i=0; int x=0;
- //the array of size N is split into 'p' buckets
- while(i < p)
- {
- for (int z = 0; z < p; ++z)
- for (int j = 0; j < size/(p*p); ++j)
- {
- //every bucket has N/(p*p) items and the range is [min : VALUE-1 ]
- int min = VALUE*z;
-
- vec[x]= min + ( rand() % (VALUE-1) ) ;
- x++;
- }
- i++;
- }
-
- return measure(vec);
+ return measure(generateBucket(size));
}
double staggared(int size)
{
- srand (size + 815618);
- vector<int> vec(size);
-
- int tmp=4096; //(RAND_MAX)/p; --> size=2048
- int p= (size+tmp-1)/tmp;
-
- const int VALUE = (1<<30)/p; //(RAND_MAX)/p;
-
- int i=1; int x=0;
- //the array of size N is split into 'p' buckets
- while(i <= p)
- {
- //every bucket has N/(p) items
- for (int j = 0; j < size/(p); ++j)
- {
- int min;
-
- if(i<=(p/2))
- min = (2*i -1)*VALUE;
-
- else
- min = (2*i-p-1)*VALUE;
-
- vec[x++]= min + ( rand() % (VALUE - 1) );
- }
- i++;
- }
-
- return measure(vec);
+ return measure(generateStaggered(size));
}
void start(ostream & out, string delim)
diff --git a/benchmark/generators.cpp b/benchmark/generators.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e117a5abecaadcf9c07e2b4e1b153c03b43dfc1a
--- /dev/null
+++ b/benchmark/generators.cpp
@@ -0,0 +1,148 @@
+#pragma once
+#include <numeric>
+#include <vector>
+#include <algorithm>
+#include <cmath>
+using namespace std;
+
+vector<int> generateSorted(int size)
+{
+ vector<int> vec(size);
+
+ iota(vec.begin(), vec.end(), 0);
+
+ return vec;
+}
+
+vector<int> generateRandom(int size)
+{
+ vector<int> vec(size);
+
+ srand(size + 2021);
+ generate(vec.begin(), vec.end(), [=](){return std::rand() % (2*size);});
+
+ return vec;
+}
+
+vector<int> generateShuffle(int size)
+{
+ vector<int> vec(size);
+
+ iota(vec.begin(), vec.end(), 0);
+ srand(size);
+ random_shuffle(vec.begin(), vec.end());
+
+ return vec;
+}
+
+vector<int> generateAlmostSorted(int size)
+{
+ vector<int> vec(size);
+
+ iota(vec.begin(), vec.end(), 0);
+ srand(9451);
+ for(int i = 0; i < 3; i++) //swaps 3 times in array
+ {
+ int s = rand() % (size - 3);
+ std::swap(vec[s], vec[s + 1]);
+ }
+
+ return vec;
+}
+
+vector<int> generateDecreasing(int size)
+{
+ vector<int> vec(size);
+
+ for(int i = 0; i < size; i++)
+ vec[i] = size - i;
+
+ return vec;
+}
+
+vector<int> generateZero_entropy(int size)
+{
+ vector<int> vec(size, 515);
+ return vec;
+}
+
+vector<int> generateGaussian(int size)
+{
+ vector<int> vec(size);
+ srand(size + 2000);
+
+ for (int i = 0; i < size; ++i)
+ {
+ int value = 0;
+ for (int j = 0; j < 4; ++j)
+ value += rand()%16384;
+
+ vec[i] = value /4;
+ }
+
+ return vec;
+}
+
+vector<int> generateBucket(int size)
+{
+ vector<int> vec(size);
+
+ srand (size + 94215);
+ double tmp = ((double)size)*3000000; //(RAND_MAX)/p; --> ((double)N)*30000;
+ double tmp2 = sqrt(tmp);
+
+ int p= (size+tmp2-1)/tmp2;
+
+ const int VALUE = 8192/p; //(RAND_MAX)/p;
+
+ int i=0; int x=0;
+ //the array of size N is split into 'p' buckets
+ while(i < p)
+ {
+ for (int z = 0; z < p; ++z)
+ for (int j = 0; j < size/(p*p); ++j)
+ {
+ //every bucket has N/(p*p) items and the range is [min : VALUE-1 ]
+ int min = VALUE*z;
+
+ vec[x]= min + ( rand() % (VALUE-1) ) ;
+ x++;
+ }
+ i++;
+ }
+
+ return vec;
+}
+
+vector<int> generateStaggered(int size)
+{
+ vector<int> vec(size);
+
+ srand (size + 815618);
+ int tmp=4096; //(RAND_MAX)/p; --> size=2048
+ int p= (size+tmp-1)/tmp;
+
+ const int VALUE = (1<<30)/p; //(RAND_MAX)/p;
+
+ int i=1; int x=0;
+ //the array of size N is split into 'p' buckets
+ while(i <= p)
+ {
+ //every bucket has N/(p) items
+ for (int j = 0; j < size/(p); ++j)
+ {
+ int min;
+
+ if(i<=(p/2))
+ min = (2*i -1)*VALUE;
+
+ else
+ min = (2*i-p-1)*VALUE;
+
+ vec[x++]= min + ( rand() % (VALUE - 1) );
+ }
+ i++;
+ }
+
+ return vec;
+}
\ No newline at end of file