diff --git a/sim/src/common/eventDetectorDefinitions.h b/sim/src/common/eventDetectorDefinitions.h index 6433803358e1b92ea01a3268a25826b45cf9cd20..c73a8f09bba181f852d9e7978ca05d89dd4223cf 100644 --- a/sim/src/common/eventDetectorDefinitions.h +++ b/sim/src/common/eventDetectorDefinitions.h @@ -78,7 +78,7 @@ public: } private: - const std::vector<std::string> triggeringEntityNames; + std::vector<std::string> triggeringEntityNames; }; class OPENPASSCOMMONEXPORT TimeToCollisionCondition : public ByEntityCondition @@ -99,9 +99,9 @@ public: std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const; private: - const std::string referenceEntityName; - const double targetTTC; - const Rule rule; + std::string referenceEntityName; + double targetTTC; + Rule rule; }; class OPENPASSCOMMONEXPORT TimeHeadwayCondition : public ByEntityCondition @@ -124,10 +124,10 @@ public: std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const; private: - const std::string referenceEntityName; - const double targetTHW; - const bool freeSpace; - const Rule rule; + std::string referenceEntityName; + double targetTHW; + bool freeSpace; + Rule rule; }; class OPENPASSCOMMONEXPORT ReachPositionCondition : public ByEntityCondition @@ -162,8 +162,8 @@ public: std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const; private: - const double tolerance{}; - const openScenario::Position position{}; + double tolerance{}; + openScenario::Position position{}; }; class OPENPASSCOMMONEXPORT RelativeSpeedCondition : public ByEntityCondition @@ -184,9 +184,9 @@ public: std::vector<const AgentInterface*> IsMet(WorldInterface * const world) const; private: - const std::string referenceEntityName{}; - const double value{}; - const Rule rule{}; + std::string referenceEntityName{}; + double value{}; + Rule rule{}; }; // OpenScenario ByValue Conditions @@ -199,7 +199,7 @@ public: ByValueCondition(const ByValueCondition&) = default; virtual ~ByValueCondition(); protected: - const Rule rule; + Rule rule; }; class OPENPASSCOMMONEXPORT SimulationTimeCondition : public ByValueCondition @@ -217,7 +217,7 @@ public: int GetTargetValue() const; private: - const int targetValue; + int targetValue; }; using Condition = std::variant<ReachPositionCondition,