From a5f1e1471e2ad2d144d2c727002d40c8263f92d1 Mon Sep 17 00:00:00 2001
From: schroedtert <t.schroedter@fz-juelich.de>
Date: Wed, 22 Nov 2023 16:25:25 +0100
Subject: [PATCH] OperationalDecisionSystem Factory

---
 .../src/OperationalDecisionSystem.hpp         | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/libsimulator/src/OperationalDecisionSystem.hpp b/libsimulator/src/OperationalDecisionSystem.hpp
index 589c360b04..e36da2f7d2 100644
--- a/libsimulator/src/OperationalDecisionSystem.hpp
+++ b/libsimulator/src/OperationalDecisionSystem.hpp
@@ -8,6 +8,7 @@
 #include "NeighborhoodSearch.hpp"
 #include "OperationalModel.hpp"
 #include "OperationalModelType.hpp"
+#include "OptimalStepsModel.hpp"
 #include "SimulationError.hpp"
 
 #include <boost/iterator/zip_iterator.hpp>
@@ -16,7 +17,24 @@
 #include <memory>
 #include <vector>
 
-class OperationalDecisionSystem
+class OperationalDecisionSystemInterface
+{
+public:
+    virtual ~OperationalDecisionSystemInterface() = default;
+    virtual void
+    Run(double dT,
+        double /*t_in_sec*/,
+        const NeighborhoodSearch<GenericAgent>& neighborhoodSearch,
+        const CollisionGeometry& geometry,
+        std::vector<GenericAgent>& agents) const = 0;
+
+    virtual void ValidateAgent(
+        const GenericAgent& agent,
+        const NeighborhoodSearch<GenericAgent>& neighborhoodSearch,
+        const CollisionGeometry& geometry) const = 0;
+};
+
+class OperationalDecisionSystem : public OperationalDecisionSystemInterface
 {
     std::unique_ptr<OperationalModel> _model{};
 
@@ -37,7 +55,7 @@ class OperationalDecisionSystem
         double /*t_in_sec*/,
         const NeighborhoodSearch<GenericAgent>& neighborhoodSearch,
         const CollisionGeometry& geometry,
-        std::vector<GenericAgent>& agents) const
+        std::vector<GenericAgent>& agents) const override
     {
         std::vector<std::optional<OperationalModelUpdate>> updates{};
         updates.reserve(agents.size());
@@ -64,8 +82,11 @@ class OperationalDecisionSystem
     void ValidateAgent(
         const GenericAgent& agent,
         const NeighborhoodSearch<GenericAgent>& neighborhoodSearch,
-        const CollisionGeometry& geometry) const
+        const CollisionGeometry& geometry) const override
     {
         _model->CheckModelConstraint(agent, neighborhoodSearch, geometry);
     }
 };
+
+std::unique_ptr<OperationalDecisionSystemInterface>
+MakeOperationalDecisionSystem(std::unique_ptr<OperationalModel>&& model);
\ No newline at end of file