Merge branch 'generalized-merging' of github.com:dbrumbaugh/dynamic-extension-working into generalized-merging

8 files changed, 8 insertions, 8 deletions

diff --git a/benchmarks/vldb/irs_bench.cpp b/benchmarks/vldb/irs_bench.cpp
index 7cbccd1..fc18b52 100644
--- a/benchmarks/vldb/irs_bench.cpp
+++ b/benchmarks/vldb/irs_bench.cpp
@@ -37,7 +37,7 @@ int main(int argc, char **argv) {
     std::string d_fname = std::string(argv[2]);
     std::string q_fname = std::string(argv[3]);
 
-    auto policy = get_policy<Shard, Q>(12000, 8);
+    auto policy = get_policy<Shard, Q>(8, 12000);
     auto extension = new Ext(policy, 12000);
     gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937);
     
diff --git a/benchmarks/vldb/pgm_bench.cpp b/benchmarks/vldb/pgm_bench.cpp
index b5f9206..cd0b984 100644
--- a/benchmarks/vldb/pgm_bench.cpp
+++ b/benchmarks/vldb/pgm_bench.cpp
@@ -39,7 +39,7 @@ int main(int argc, char **argv) {
     std::string d_fname = std::string(argv[2]);
     std::string q_fname = std::string(argv[3]);
 
-    auto policy = get_policy<Shard, Q>(12000, 8);
+    auto policy = get_policy<Shard, Q>(8, 12000);
     auto extension = new Ext(policy, 12000);
     gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937);
     
diff --git a/benchmarks/vldb/ts_bench.cpp b/benchmarks/vldb/ts_bench.cpp
index 61d813c..8b0ee35 100644
--- a/benchmarks/vldb/ts_bench.cpp
+++ b/benchmarks/vldb/ts_bench.cpp
@@ -40,7 +40,7 @@ int main(int argc, char **argv) {
     std::string d_fname = std::string(argv[2]);
     std::string q_fname = std::string(argv[3]);
 
-    auto policy = get_policy<Shard, Q>(8000, 8);
+    auto policy = get_policy<Shard, Q>(8, 8000);
     auto extension = new Ext(policy, 8000);
     gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937);
     
diff --git a/benchmarks/vldb/ts_bsm_bench.cpp b/benchmarks/vldb/ts_bsm_bench.cpp
index f5ad931..01ff0f1 100644
--- a/benchmarks/vldb/ts_bsm_bench.cpp
+++ b/benchmarks/vldb/ts_bsm_bench.cpp
@@ -40,7 +40,7 @@ int main(int argc, char **argv) {
     std::string d_fname = std::string(argv[2]);
     std::string q_fname = std::string(argv[3]);
 
-    auto policy = get_policy<Shard, Q>(1, 2, 3);
+    auto policy = get_policy<Shard, Q>(2, 1, 3);
     auto extension = new Ext(policy, 1);
                              
     gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937);
diff --git a/benchmarks/vldb/vptree_bench.cpp b/benchmarks/vldb/vptree_bench.cpp
index b75b5c2..1e4df2e 100644
--- a/benchmarks/vldb/vptree_bench.cpp
+++ b/benchmarks/vldb/vptree_bench.cpp
@@ -38,7 +38,7 @@ int main(int argc, char **argv) {
     std::string d_fname = std::string(argv[2]);
     std::string q_fname = std::string(argv[3]);
 
-    auto policy = get_policy<Shard, Q>(1400, 8);
+    auto policy = get_policy<Shard, Q>(8, 1400);
     auto extension = new Ext(policy, 1400); 
     gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937);
     
diff --git a/benchmarks/vldb/vptree_bench_alt.cpp b/benchmarks/vldb/vptree_bench_alt.cpp
index 05c9720..43614f1 100644
--- a/benchmarks/vldb/vptree_bench_alt.cpp
+++ b/benchmarks/vldb/vptree_bench_alt.cpp
@@ -38,7 +38,7 @@ int main(int argc, char **argv) {
     std::string d_fname = std::string(argv[2]);
     std::string q_fname = std::string(argv[3]);
 
-    auto policy = get_policy<Shard, Q>(1400, 8);
+    auto policy = get_policy<Shard, Q>(8, 1400);
     auto extension = new Ext(policy, 1400); 
 
     gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937);
diff --git a/benchmarks/vldb/vptree_bsm_bench.cpp b/benchmarks/vldb/vptree_bsm_bench.cpp
index d366c46..77c6933 100644
--- a/benchmarks/vldb/vptree_bsm_bench.cpp
+++ b/benchmarks/vldb/vptree_bsm_bench.cpp
@@ -39,7 +39,7 @@ int main(int argc, char **argv) {
     std::string d_fname = std::string(argv[2]);
     std::string q_fname = std::string(argv[3]);
 
-    auto policy = get_policy<Shard, Q>(1, 2, 3);
+    auto policy = get_policy<Shard, Q>(2, 1, 3);
     auto extension = new Ext(policy, 1, 0, 64);
     gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937);
     
diff --git a/benchmarks/vldb/vptree_bsm_bench_alt.cpp b/benchmarks/vldb/vptree_bsm_bench_alt.cpp
index cf79447..05619a6 100644
--- a/benchmarks/vldb/vptree_bsm_bench_alt.cpp
+++ b/benchmarks/vldb/vptree_bsm_bench_alt.cpp
@@ -38,7 +38,7 @@ int main(int argc, char **argv) {
     std::string d_fname = std::string(argv[2]);
     std::string q_fname = std::string(argv[3]);
 
-    auto policy = get_policy<Shard, Q>(1, 2, 3);
+    auto policy = get_policy<Shard, Q>(2, 1, 3);
     auto extension = new Ext(policy, 1);
     gsl_rng * rng = gsl_rng_alloc(gsl_rng_mt19937);