From 10b4425e842d10b7fbfa85978969ed4591d6b98e Mon Sep 17 00:00:00 2001
From: Douglas Rumbaugh <dbr4@psu.edu>
Date: Wed, 7 Feb 2024 10:56:52 -0500
Subject: Fully implemented Query concept and adjusted queries to use it

---
 include/query/wss.h | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'include/query/wss.h')

diff --git a/include/query/wss.h b/include/query/wss.h
index 4c8861e..9f192ee 100644
--- a/include/query/wss.h
+++ b/include/query/wss.h
@@ -11,9 +11,8 @@
  */
 #pragma once
 
-#include "framework/interface/Record.h"
-#include "framework/interface/Shard.h"
-#include "framework/structure/MutableBuffer.h"
+#include "framework/QueryRequirements.h"
+#include "psu-ds/Alias.h"
 
 namespace de { namespace wss {
 
@@ -40,6 +39,7 @@ struct BufferState {
     psudb::Alias *alias;
     decltype(R::weight) max_weight;
     decltype(R::weight) total_weight;
+    BufferView<R> *buffer;
 
     ~BufferState() {
         delete alias;
@@ -60,23 +60,24 @@ public:
         return res;
     }
 
-    static void* get_buffer_query_state(MutableBuffer<R> *buffer, void *parms) {
+    static void* get_buffer_query_state(BufferState<R> *buffer, void *parms) {
         BufferState<R> *state = new BufferState<R>();
         auto parameters = (Parms<R>*) parms;
         if constexpr (Rejection) {
             state->cutoff = buffer->get_record_count() - 1;
             state->max_weight = buffer->get_max_weight();
             state->total_weight = buffer->get_total_weight();
+            state->buffer = buffer;
             return state;
         }
 
         std::vector<double> weights;
 
-        state->cutoff = buffer->get_record_count() - 1;
         double total_weight = 0.0;
+        state->buffer = buffer;
 
-        for (size_t i = 0; i <= state->cutoff; i++) {
-            auto rec = buffer->get_data() + i;
+        for (size_t i = 0; i <= buffer->get_record_count(); i++) {
+            auto rec = buffer->get_data(i);
             weights.push_back(rec->rec.weight);
             total_weight += rec->rec.weight;
         }
@@ -152,9 +153,10 @@ public:
         return result_set;
     }
 
-    static std::vector<Wrapped<R>> buffer_query(MutableBuffer<R> *buffer, void *state, void *parms) {
+    static std::vector<Wrapped<R>> buffer_query(void *state, void *parms) {
         auto st = (BufferState<R> *) state;
         auto p = (Parms<R> *) parms;
+        auto buffer = st->buffer;
 
         std::vector<Wrapped<R>> result;
         result.reserve(st->sample_size);
@@ -162,7 +164,7 @@ public:
         if constexpr (Rejection) {
             for (size_t i=0; i<st->sample_size; i++) {
                 auto idx = gsl_rng_uniform_int(p->rng, st->cutoff);
-                auto rec = buffer->get_data() + idx;
+                auto rec = buffer->get(idx);
 
                 auto test = gsl_rng_uniform(p->rng) * st->max_weight;
 
-- 
cgit v1.2.3