From b0dea94f86ba96a7c319764d6b7d920d202ffa7e Mon Sep 17 00:00:00 2001
From: Dong Xie <dongx@psu.edu>
Date: Fri, 28 Jul 2023 02:31:52 -0400
Subject: Change PGM to range count.

---
 benchmarks/pgm_rq_bench.cpp        |  4 ++--
 benchmarks/triespline_rq_bench.cpp |  5 +++--
 benchmarks/upgm_rq_bench.cpp       | 14 +++++++++-----
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'benchmarks')

diff --git a/benchmarks/pgm_rq_bench.cpp b/benchmarks/pgm_rq_bench.cpp
index 3acc34e..e25d29f 100644
--- a/benchmarks/pgm_rq_bench.cpp
+++ b/benchmarks/pgm_rq_bench.cpp
@@ -18,13 +18,13 @@ int main(int argc, char **argv)
     std::string filename = std::string(argv[1]);
     size_t record_count = atol(argv[2]);
     size_t buffer_cap = 12000;
-    size_t scale_factor = 6;
+    size_t scale_factor = 8;
     double delete_prop = atof(argv[3]);
     double max_delete_prop = (delete_prop > 0) ? delete_prop : 1;
     std::string query_file = std::string(argv[4]);
     bool use_osm = (argc == 6) ? atoi(argv[5]) : 0;
 
-    double insert_batch = 0.1; 
+    double insert_batch = 0.5; 
 
     init_bench_env(record_count, true, use_osm);
 
diff --git a/benchmarks/triespline_rq_bench.cpp b/benchmarks/triespline_rq_bench.cpp
index 0c4a0fe..967c3b0 100644
--- a/benchmarks/triespline_rq_bench.cpp
+++ b/benchmarks/triespline_rq_bench.cpp
@@ -18,13 +18,13 @@ int main(int argc, char **argv)
     std::string filename = std::string(argv[1]);
     size_t record_count = atol(argv[2]);
     size_t buffer_cap = 12000;
-    size_t scale_factor = 6;
+    size_t scale_factor = 8;
     double delete_prop = atof(argv[3]);
     double max_delete_prop = (delete_prop > 0) ? delete_prop : 1;
     std::string query_file = std::string(argv[4]);
     bool use_osm = (argc == 6) ? atoi(argv[5]) : 0;
 
-    double insert_batch = 0.1; 
+    double insert_batch = 0.5; 
 
     init_bench_env(record_count, true, use_osm);
 
@@ -46,6 +46,7 @@ int main(int argc, char **argv)
     insert_tput_bench<ExtendedTSRQ, Rec>(de, datafile, insert_cnt, delete_prop, to_delete, true);
     fprintf(stdout, "%ld\t", de.get_memory_usage());
     query_latency_bench<ExtendedTSRQ, Rec, de::ts_range_query_parms<Rec>>(de, queries, 1);
+    fprintf(stdout, "\n");
 
     auto ts = de.create_static_structure();
 
diff --git a/benchmarks/upgm_rq_bench.cpp b/benchmarks/upgm_rq_bench.cpp
index 77efd08..940a9e6 100644
--- a/benchmarks/upgm_rq_bench.cpp
+++ b/benchmarks/upgm_rq_bench.cpp
@@ -144,17 +144,21 @@ static void pgm_rq_bench(PGM &pgm, std::vector<query> queries, size_t trial_cnt=
     size_t batches = trial_cnt / batch_size;
     size_t total_time = 0;
 
-    std::vector<record> result_set;
+    //std::vector<record> result_set;
+	size_t tot = 0;
 
     for (int i=0; i<trial_cnt; i++) {
         auto start = std::chrono::high_resolution_clock::now();
         for (size_t j=0; j<queries.size(); j++) {
-            auto ptr = pgm.find(queries[j].lower_bound);
+            auto ptr = pgm.find(queries[j].lower_bound);\
+			tot = 0;
             while (ptr != pgm.end() && ptr->first <= queries[j].upper_bound) {
-                result_set.push_back({ptr->first, ptr->second});
+				++tot;
+                //result_set.push_back({ptr->first, ptr->second});
                 ++ptr;
             }
-            result_set.clear();
+			assert(tot > 0);
+            //result_set.clear();
         }
         auto stop = std::chrono::high_resolution_clock::now();
 
@@ -178,7 +182,7 @@ int main(int argc, char **argv)
     double delete_prop = atof(argv[3]);
     std::string qfilename = std::string(argv[4]);
 
-    double insert_batch = 0.1; 
+    double insert_batch = 0.5; 
 
     init_bench_env(record_count, true);
     auto queries = read_range_queries<query>(qfilename, .0001);
-- 
cgit v1.2.3