Refactor DataReceiver to base class

source/DataCollection/DataReceiver.hpp

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <vector>
+
+namespace DataCollection {
+
+    template <typename T>
+    class DataReceiver {
+
+    public:
+    DataReceiver() = default;
+    virtual ~DataReceiver() = default;
+
+    virtual void DebugPrint() = 0;
+    inline void store_data(T obj) { storage.push_back(obj); }
+
+    protected:
+    std::vector<T> storage;
+
+    };
+}

source/DataCollection/GridPositionReceiver.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <iostream>
+
+#include "DataReceiver.hpp"
+#include "../core/GridPosition.hpp"
+
+namespace DataCollection {
+
+    class GridPositionReceiver : public DataReceiver<cse491::GridPosition> {
+        public:
+        void DebugPrint() override {
+            auto pos = storage.back();
+            std::cout << "Adding: (" << pos.GetX() << ", " << pos.GetY() << ")" << std::endl;
+        }
+    };
+}

source/core/WorldBase.hpp

@@ -15,7 +15,7 @@
 #include "Data.hpp"
 #include "Entity.hpp"
 #include "WorldGrid.hpp"
-#include "../DataCollection/DateReceiver.hpp"
+#include "../DataCollection/GridPositionReceiver.hpp"
 
 namespace cse491 {
 
@@ -29,6 +29,8 @@ namespace cse491 {
     item_set_t item_set;     ///< Vector of pointers to non-agent entities
     agent_set_t agent_set;   ///< Vector of pointers to agent entities
 
+    std::shared_ptr<DataCollection::GridPositionReceiver> grid_receiver;
+
     bool run_over = false;   ///< Should the run end?
 
     /// Helper function that is run whenever a new agent is created.
@@ -102,6 +104,9 @@ namespace cse491 {
       return *agent_set.back();
     }
 
+    void SetGridReceiver(DataCollection::GridPositionReceiver r) {
+      grid_receiver = std::make_shared<DataCollection::GridPositionReceiver>(r);
+    }
 
     // -- Action Management --
 
@@ -124,14 +129,8 @@ namespace cse491 {
     }
 
     void CollectData() {
-      // calling the collectdata class + the function and store the data (agent_ptr) into it
-
-      for (auto & agent_ptr : agent_set) {
-          //store data
-          GroupTwo::DataReceiver receiver;
-          receiver.store_agent(agent_ptr->GetPosition());
-      }
-
+      auto & agent = agent_set.at(2);
+      grid_receiver->store_data(agent->GetPosition());
     }
 
     /// @brief UpdateWorld() is run after every agent has a turn.

source/simple_main.cpp

@@ -8,13 +8,16 @@
 #include "Agents/PacingAgent.hpp"
 #include "Interfaces/TrashInterface.hpp"
 #include "Worlds/MazeWorld.hpp"
+#include "DataCollection/GridPositionReceiver.hpp"
 
 int main()
 {
   cse491::MazeWorld world;
+  DataCollection::GridPositionReceiver receiver;
   world.AddAgent<cse491::PacingAgent>("Pacer 1").SetPosition(3,1);
   world.AddAgent<cse491::PacingAgent>("Pacer 2").SetPosition(6,1);
   world.AddAgent<cse491::TrashInterface>("Interface").SetProperty("char", '@');
+  world.SetGridReceiver(receiver);
 
   world.Run();