finished

engine/gen/Storyboard/GenericAction/TrafficSignalControllerAction_base.h

@@ -17,7 +17,6 @@
 
 #include "Conversion/OscToMantle/ConvertScenarioPhase.h"
 #include "Conversion/OscToMantle/ConvertScenarioTrafficSignalController.h"
-#include "Utils/EntityBroker.h"
 
 namespace OpenScenarioEngine::v1_2
 {
@@ -26,7 +25,6 @@ class TrafficSignalControllerActionBase
 public:
   struct Values
   {
-    Entities entities;
     std::string phase;
     OPENSCENARIO::TrafficSignalController trafficSignalControllerRef;
     OPENSCENARIO::Phase phaseRef;

engine/gen/Storyboard/GenericAction/TrafficSignalStateAction.h

@@ -19,7 +19,6 @@
 #include <utility>
 
 #include "Storyboard/GenericAction/TrafficSignalStateAction_impl.h"
-#include "Utils/EntityBroker.h"
 
 class TrafficSignalStateAction : public yase::ActionNode
 {
@@ -43,11 +42,9 @@ private:
   void lookupAndRegisterData(yase::Blackboard& blackboard) final
   {
     std::shared_ptr<mantle_api::IEnvironment> environment = blackboard.get<std::shared_ptr<mantle_api::IEnvironment>>("Environment");
-    const EntityBroker::Ptr entityBroker = blackboard.get<EntityBroker::Ptr>("EntityBroker");
 
     impl_ = std::make_unique<OpenScenarioEngine::v1_2::TrafficSignalStateAction>(
         OpenScenarioEngine::v1_2::TrafficSignalStateAction::Values{
-            entityBroker->GetEntities(),
             trafficSignalStateAction_->GetName(),
             trafficSignalStateAction_->GetState()},
         OpenScenarioEngine::v1_2::TrafficSignalStateAction::Interfaces{

engine/gen/Storyboard/GenericAction/TrafficSignalStateAction_base.h

@@ -15,8 +15,6 @@
 
 #include <string>
 
-#include "Utils/EntityBroker.h"
-
 namespace OpenScenarioEngine::v1_2
 {
 class TrafficSignalStateActionBase
@@ -24,7 +22,6 @@ class TrafficSignalStateActionBase
 public:
   struct Values
   {
-    Entities entities;
     std::string name;
     std::string state;
   };

engine/gen/Storyboard/GenericAction/VariableModifyAction.h

@@ -18,7 +18,6 @@
 #include <utility>
 
 #include "Storyboard/GenericAction/VariableModifyAction_impl.h"
-#include "Utils/EntityBroker.h"
 
 class VariableModifyAction : public yase::ActionNode
 {
@@ -42,11 +41,9 @@ private:
   void lookupAndRegisterData(yase::Blackboard& blackboard) final
   {
     std::shared_ptr<mantle_api::IEnvironment> environment = blackboard.get<std::shared_ptr<mantle_api::IEnvironment>>("Environment");
-    const EntityBroker::Ptr entityBroker = blackboard.get<EntityBroker::Ptr>("EntityBroker");
 
     impl_ = std::make_unique<OpenScenarioEngine::v1_2::VariableModifyAction>(
         OpenScenarioEngine::v1_2::VariableModifyAction::Values{
-            entityBroker->GetEntities(),
 
         },
         OpenScenarioEngine::v1_2::VariableModifyAction::Interfaces{

engine/gen/Storyboard/GenericAction/VariableModifyAction_base.h

@@ -12,8 +12,6 @@
 
 #include <MantleAPI/Execution/i_environment.h>
 
-#include "Utils/EntityBroker.h"
-
 namespace OpenScenarioEngine::v1_2
 {
 class VariableModifyActionBase
@@ -21,7 +19,6 @@ class VariableModifyActionBase
 public:
   struct Values
   {
-    Entities entities;
   };
   struct Interfaces
   {

engine/gen/Storyboard/GenericAction/VariableModifyAction_impl.cpp

@@ -10,7 +10,7 @@
 
 #include "Storyboard/GenericAction/VariableModifyAction_impl.h"
 
-#include <iostream>
+#include "Utils/Logger.h"
 
 namespace OpenScenarioEngine::v1_2
 {
@@ -19,7 +19,7 @@ bool VariableModifyAction::Step()
   // Note:
   // - Access to values parse to mantle/ose datatypes: this->values.xxx
   // - Access to mantle interfaces: this->mantle.xxx
-  std::cout << "Method VariableModifyAction::Step() not implemented yet (returning \"true\" by default)\n";
+  OPENSCENARIO::Logger::Warning("Method VariableModifyAction::Step() not implemented yet (returning \"true\" by default)");
   return true;
 }
 

engine/gen/Storyboard/GenericAction/VariableSetAction.h

@@ -18,7 +18,6 @@
 #include <utility>
 
 #include "Storyboard/GenericAction/VariableSetAction_impl.h"
-#include "Utils/EntityBroker.h"
 
 class VariableSetAction : public yase::ActionNode
 {
@@ -42,11 +41,9 @@ private:
   void lookupAndRegisterData(yase::Blackboard& blackboard) final
   {
     std::shared_ptr<mantle_api::IEnvironment> environment = blackboard.get<std::shared_ptr<mantle_api::IEnvironment>>("Environment");
-    const EntityBroker::Ptr entityBroker = blackboard.get<EntityBroker::Ptr>("EntityBroker");
 
     impl_ = std::make_unique<OpenScenarioEngine::v1_2::VariableSetAction>(
         OpenScenarioEngine::v1_2::VariableSetAction::Values{
-            entityBroker->GetEntities(),
             variableSetAction_->GetValue()},
         OpenScenarioEngine::v1_2::VariableSetAction::Interfaces{
             environment});

engine/gen/Storyboard/GenericAction/VariableSetAction_base.h

@@ -14,8 +14,6 @@
 
 #include <string>
 
-#include "Utils/EntityBroker.h"
-
 namespace OpenScenarioEngine::v1_2
 {
 class VariableSetActionBase
@@ -23,7 +21,6 @@ class VariableSetActionBase
 public:
   struct Values
   {
-    Entities entities;
     std::string value;
   };
   struct Interfaces

engine/gen/Storyboard/GenericAction/VariableSetAction_impl.cpp

@@ -10,7 +10,7 @@
 
 #include "Storyboard/GenericAction/VariableSetAction_impl.h"
 
-#include <iostream>
+#include "Utils/Logger.h"
 
 namespace OpenScenarioEngine::v1_2
 {
@@ -19,7 +19,7 @@ bool VariableSetAction::Step()
   // Note:
   // - Access to values parse to mantle/ose datatypes: this->values.xxx
   // - Access to mantle interfaces: this->mantle.xxx
-  std::cout << "Method VariableSetAction::Step() not implemented yet (returning \"true\" by default)\n";
+  OPENSCENARIO::Logger::Warning("Method VariableSetAction::Step() not implemented yet (returning \"true\" by default)");
   return true;
 }
 

engine/src/Node/ConditionNode.h

@@ -23,7 +23,7 @@ namespace yase
 {
 /// Checks if underlying conditions are satisfied and adds control flow logic, such as delayed execution
 ///
-/// \see https://www.asam.net/static_downloads/ASAM_OpenSCENARIO_V1.1.1_Model_Documentation/modelDocumentation/index.html
+/// \see https://www.asam.net/static_downloads/ASAM_OpenSCENARIO_V1.2.0_Model_Documentation/modelDocumentation/index.html
 class ConditionNode : public yase::DecoratorNode
 {
 public:

engine/src/Storyboard/ByEntityCondition/ReachPositionCondition_impl.cpp

@@ -12,6 +12,8 @@
 
 #include <units.h>
 
+#include "Utils/Logger.h"
+
 namespace OpenScenarioEngine::v1_2
 {
 bool ReachPositionCondition::IsSatisfied() const

engine/tests/Storyboard/GenericAction/TrafficSignalStateActionTest.cpp

@@ -28,8 +28,7 @@ TEST(TrafficSignalStateActionTest, GivenTrafficStateAndName_SetTrafficSignal)
           SetTrafficSignalState(expected_name, expected_state))
       .WillByDefault(Return());
 
-  OpenScenarioEngine::v1_2::TrafficSignalStateAction trafficSignalStateAction({{"traffic_signal"},
-                                                                               expected_name,
+  OpenScenarioEngine::v1_2::TrafficSignalStateAction trafficSignalStateAction({expected_name,
                                                                                expected_state},
                                                                               {mockEnvironment});
 

generator/templates/Storyboard/ByValueCondition_impl.cpp.j2

@@ -11,7 +11,8 @@
 {% block header %}
 #include "Storyboard/ByValueCondition/{{ name }}_impl.h"
 {% endblock %}
-#include <iostream>
+
+#include "Utils/Logger.h"
 
 namespace {{ ose_namespace }} {
 
@@ -20,8 +21,8 @@ bool {{ name }}::IsSatisfied() const
   // Note:
   // - Access to values parse to mantle/ose datatypes: this->values.xxx
   // - Access to mantle interfaces: this->mantle.xxx
-  std::cout << "Method {{ name }}::IsSatisfied() not implemented yet (returning \"true\" by default)\n";
+  OPENSCENARIO::Logger::Warning("Method {{ name }}::IsSatisfied() not implemented yet (returning \"true\" by default)");
   return true;
 }
 
-} // namespace {{ ose_namespace }}
+} // namespace {{ ose_namespace }}
\ No newline at end of file

generator/templates/Storyboard/GenericAction_impl.cpp.j2

@@ -9,7 +9,8 @@
  ********************************************************************************/
 
 #include "Storyboard/GenericAction/{{ name }}_impl.h"
-#include <iostream>
+
+#include "Utils/Logger.h"
 
 namespace {{ ose_namespace }} {
 
@@ -18,8 +19,8 @@ bool {{ name }}::Step()
   // Note:
   // - Access to values parse to mantle/ose datatypes: this->values.xxx
   // - Access to mantle interfaces: this->mantle.xxx
-  std::cout << "Method {{ name }}::Step() not implemented yet (returning \"true\" by default)\n";
+  OPENSCENARIO::Logger::Warning("Method {{ name }}::Step() not implemented yet (returning \"true\" by default)");
   return true;
 }
 
-} // namespace {{ ose_namespace }}
+} // namespace {{ ose_namespace }}
\ No newline at end of file

generator/templates/Storyboard/MotionControlAction_impl.cpp.j2

@@ -9,7 +9,8 @@
  ********************************************************************************/
 
 #include "Storyboard/MotionControlAction/{{ name }}_impl.h"
-#include <iostream>
+
+#include "Utils/Logger.h"
 
 namespace {{ ose_namespace }} {
 
@@ -18,7 +19,7 @@ void {{ name }}::SetControlStrategy()
   // Note:
   // - Access to values parse to mantle/ose datatypes: this->values.xxx
   // - Access to mantle interfaces: this->mantle.xxx
-  std::cout << "Method {{ name }}::SetControlStrategy() not implemented yet\n";
+  OPENSCENARIO::Logger::Warning("Method {{ name }}::SetControlStrategy() not implemented yet");
 }
 
 bool {{ name }}::HasControlStrategyGoalBeenReached(const std::string& actor)
@@ -26,7 +27,7 @@ bool {{ name }}::HasControlStrategyGoalBeenReached(const std::string& actor)
   // Note:
   // - Access to values parse to mantle/ose datatypes: this->values.xxx
   // - Access to mantle interfaces: this->mantle.xxx
-  std::cout << "Method {{ name }}::HasControlStrategyGoalBeenReached() not implemented yet (returning \"true\" by default)\n";
+  OPENSCENARIO::Logger::Warning("Method {{ name }}::HasControlStrategyGoalBeenReached() not implemented yet (returning \"true\" by default)");
   return true;
 }
 
@@ -36,4 +37,4 @@ mantle_api::MovementDomain {{ name }}::GetMovementDomain() const
   return mantle_api::MovementDomain::kLateral;
 }
 
-} // namespace {{ ose_namespace }}
+} // namespace {{ ose_namespace }}
\ No newline at end of file