diff --git a/CMakeLists.txt b/CMakeLists.txt index cf4a36d67064f2422a29de7ad9dfa79464ba413a..cf74d89761a041cb6a9970d4324dd2e991f58dec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ ################################################################################ # Copyright (c) 2020-2021 in-tech GmbH # 2022-2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +# 2025 Volkswagen Aktiengesellschaft # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at @@ -101,11 +102,10 @@ endif() include(install_xmlSchemas) if(INSTALL_EXAMPLES) - install( - DIRECTORY sim/contrib/examples/ - DESTINATION ${SUBDIR_EXAMPLES} - MESSAGE_NEVER - ) + #-- Common + install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/sim/contrib/examples/Common DESTINATION ${SUBDIR_EXAMPLES}) + # Other configurations + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/sim/contrib/examples/Configurations) endif() include(CPack) diff --git a/sim/contrib/examples/Configurations/CMakeLists.txt b/sim/contrib/examples/Configurations/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..54ed8f3d2fbe43d5373a14bad7bc95bb5697aebc --- /dev/null +++ b/sim/contrib/examples/Configurations/CMakeLists.txt @@ -0,0 +1,113 @@ +################################################################################ +# Copyright (c) 2025 Volkswagen Aktiengesellschaft +# +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# http://www.eclipse.org/legal/epl-2.0. +# +# SPDX-License-Identifier: EPL-2.0 +################################################################################ + +function(install_ex_config CONFIG_NAME) + #message(STATUS "Install and prepare example config ${CONFIG_NAME}") + # Copy directory from examples/Configurations + install(DIRECTORY ${CONFIG_NAME} DESTINATION ${SUBDIR_EXAMPLES}) + # Copy the missing files from the examples/Common - only the files necessary to run the simulation + if (ARGN) + foreach(CONFIG_FILE IN LISTS ARGN) + if(${CONFIG_FILE} STREQUAL "SCBP") + set(CONFIG_FILE_NAME ../Common/systemConfigBlueprint.xml) + set(DIR_CONFIG ${SUBDIR_EXAMPLES}/${CONFIG_NAME} ) + elseif(${CONFIG_FILE} STREQUAL "XOSC") + set(CONFIG_FILE_NAME ../Common/Scenario.xosc) + set(DIR_CONFIG ${SUBDIR_EXAMPLES}/${CONFIG_NAME} ) + elseif(${CONFIG_FILE} STREQUAL "XODR") + set(CONFIG_FILE_NAME ../Common/SceneryConfiguration.xodr) + set(DIR_CONFIG ${SUBDIR_EXAMPLES}/${CONFIG_NAME} ) + elseif(${CONFIG_FILE} STREQUAL "PC") + set(CONFIG_FILE_NAME ../Common/ProfilesCatalog.xml) + set(DIR_CONFIG ${SUBDIR_EXAMPLES}/${CONFIG_NAME} ) + elseif(${CONFIG_FILE} STREQUAL "SC") + set(CONFIG_FILE_NAME ../Common/simulationConfig.xml) + set(DIR_CONFIG ${SUBDIR_EXAMPLES}/${CONFIG_NAME} ) + elseif(${CONFIG_FILE} STREQUAL "VMC") + set(CONFIG_FILE_NAME ../Common/Vehicles/VehicleModelsCatalog.xosc) + set(DIR_CONFIG ${SUBDIR_EXAMPLES}/${CONFIG_NAME}/Vehicles ) + elseif(${CONFIG_FILE} STREQUAL "PMC") + set(CONFIG_FILE_NAME ../Common/Vehicles/PedestrianModelsCatalog.xosc) + set(DIR_CONFIG ${SUBDIR_EXAMPLES}/${CONFIG_NAME}/Vehicles ) + endif() + install(FILES ${CONFIG_FILE_NAME} DESTINATION ${DIR_CONFIG}) + endforeach() + endif() +endfunction() + +#install_ex_config("CONFIG" "SCBP" "SC" "PC" "XODR" "XOSC" "VMC" "PMC") +install_ex_config("ADAS_AEB_CutIn" "SCBP" "VMC") +install_ex_config("ADAS_AEB_PreventingCollisionWithObstacle" "SCBP" "VMC") +install_ex_config("ADAS_AEB_PreventingCollisionWithObstacleInCurve" "SCBP" "VMC") +install_ex_config("ADAS_Car2X" "SCBP" "XOSC" "XODR" "VMC") +install_ex_config("ADAS_Static_AEB_PreventingCollisionWithObstacle") +install_ex_config("ADAS_V2X" "SCBP" "XODR" "VMC") +install_ex_config("AFDM_TJunction" "SCBP" "PC" "VMC") +install_ex_config("ByEntityCondition_RelativeLane" "SCBP" "XODR" "VMC") +install_ex_config("ByEntityCondition_RelativeSpeed" "SCBP" "VMC") +install_ex_config("ByEntityCondition_RoadPosition" "SCBP" "VMC") +install_ex_config("ByEntityCondition_TimeHeadway" "SCBP" "VMC") +install_ex_config("ByEntityCondition_TimeToCollision" "SCBP" "VMC") +install_ex_config("DynamicOSMPSensorDataToTUStepper" "SCBP" "VMC") +install_ex_config("Dynamics_Scenario" "SCBP" "PC" "XODR" "VMC") +install_ex_config("DynamicSSPStepper" "SCBP" "VMC") +install_ex_config("FMU_Actuator" "XODR" "VMC") +install_ex_config("FMU_OSCAction_CustomCommandAction" "SCBP" "XODR" "VMC") +install_ex_config("FMU_OSCAction_FollowPathAction" "SCBP" "XODR" "VMC") +install_ex_config("FMU_OSCAction_FollowTrajectoryAction" "SCBP" "XODR" "VMC") +install_ex_config("FMU_OSCAction_SpeedAction" "SCBP" "XODR" "VMC") +install_ex_config("LightStateAction" "SCBP" "SC" "PC" "XODR" "VMC") +install_ex_config("LocalizationOnJunction" "SCBP" "PC" "VMC") +install_ex_config("OSCAction_ActivateController" "SCBP" "SC" "PC" "XODR" "VMC") +install_ex_config("OSCAction_DoubleSinusoidalLaneChangeLeft_Absolute" "SCBP" "VMC") +install_ex_config("OSCAction_DoubleSinusoidalLaneChangeLeft_Relative" "SCBP" "VMC") +install_ex_config("OSCAction_DoubleSinusoidalLaneChangeRight_Absolute" "SCBP" "VMC") +install_ex_config("OSCAction_DoubleSinusoidalLaneChangeRight_Relative" "SCBP" "VMC") +install_ex_config("OSCAction_FollowRouteAction" "SCBP" "SC" "VMC") +install_ex_config("OSCAction_RemoveAgent" "SCBP" "XODR" "VMC") +install_ex_config("OSCAction_RemoveAgentWithDelay" "SCBP" "XODR" "VMC") +install_ex_config("OSCAction_SinusoidalLaneChangeLeft_Absolute" "SCBP" "VMC") +install_ex_config("OSCAction_SinusoidalLaneChangeLeft_Relative" "SCBP" "VMC") +install_ex_config("OSCAction_SinusoidalLaneChangeRight_Absolute" "SCBP" "VMC") +install_ex_config("OSCAction_SinusoidalLaneChangeRight_Relative" "SCBP" "VMC") +install_ex_config("OSCAction_SpeedAction_Absolute" "SCBP" "PC" "XODR" "VMC") +install_ex_config("OSCAction_SpeedAction_Relative" "SCBP" "PC" "XODR" "VMC") +install_ex_config("OSCAction_SpeedAction_Step" "SCBP" "PC" "XODR" "VMC") +install_ex_config("OSCAction_TeleportAction" "SCBP" "PC" "XODR" "VMC") +install_ex_config("OSCAction_TrafficSinkAction" "SCBP" "XODR" "VMC") +install_ex_config("ObjectAboveRoad" "SCBP" "VMC") +install_ex_config("ObjectOfTypeRoadMark" "SCBP" "VMC") +install_ex_config("PCM") +install_ex_config("Pedestrian_Trajectory" "SCBP" "SC" "VMC" "PMC") +install_ex_config("Sensor_Delay" "SCBP" "VMC") +install_ex_config("Sensor_Failure_0.5_Car2X" "SCBP" "VMC") +install_ex_config("Sensor_Failure_0.5_Geometric2D" "SCBP" "VMC") +install_ex_config("Sensor_Failure_0_Car2X" "SCBP" "VMC") +install_ex_config("Sensor_Failure_1_Car2X" "SCBP" "VMC") +install_ex_config("Sensor_Latency" "SCBP" "VMC") +install_ex_config("SpawnerPreRun_Highway_EntryExit" "SCBP" "VMC") +install_ex_config("SpawnerPreRun_Highway_FullStream" "SCBP" "VMC") +install_ex_config("SpawnerPreRun_Highway_IncorrectStreamBegin" "SCBP" "VMC") +install_ex_config("SpawnerPreRun_Highway_IncorrectStreamMid" "SCBP" "VMC") +install_ex_config("SpawnerPreRun_Highway_RoadOverlap" "SCBP" "VMC") +install_ex_config("SpawnerPreRun_Highway_SimpleStream" "SCBP" "VMC") +install_ex_config("SpawnerPreRun_Highway_SingleRoad" "SCBP" "VMC") +install_ex_config("SpawnerPreRun_SingleRoad_SpecifiedLanes" "SCBP" "VMC") +install_ex_config("SpawnerPreRun_SingleRoad_SpecifiedRange" "SCBP" "VMC") +install_ex_config("SpawnerRuntime_Highway_MultipleRoads" "SCBP" "VMC") +install_ex_config("SpawnerRuntime_Highway_SingleRoad" "SCBP" "VMC") +install_ex_config("SpawnerRuntime_SingleRoad_SpecifiedLanes" "SCBP" "VMC") +install_ex_config("StaticAgentCollision" "SCBP" "SC" "XODR" "XOSC" "VMC" ) +install_ex_config("StaticOSMPSensorDataToTUStepper" "VMC") +install_ex_config("StaticSSPStepper" "VMC") +install_ex_config("SupplementaryTrafficSigns" "SCBP" "SC" "PC" "XOSC" "VMC") +install_ex_config("TrafficJam" "SCBP" "PC" "XODR" "VMC") +install_ex_config("TrafficLight" "SCBP" "SC" "PC" "VMC") +install_ex_config("TurningRates" "SCBP" "VMC" ) diff --git a/sim/contrib/examples/Configurations/PCM/Agent_Follow.xml b/sim/contrib/examples/Configurations/PCM/Agent_Follow.xml index b5878526219d5e0f446910c74c959395b1b930eb..928a90cffa3f526c3d0c9f1a4ac930d646545b0f 100644 --- a/sim/contrib/examples/Configurations/PCM/Agent_Follow.xml +++ b/sim/contrib/examples/Configurations/PCM/Agent_Follow.xml @@ -354,7 +354,7 @@ <!--parameter's title: Inertia--> <id>Inertia</id> <type>doubleVector</type> - <unit>kgm²</unit> + <unit>kgm^2</unit> <value>2,2</value> </parameter> <parameter> diff --git a/sim/contrib/examples/Configurations/StaticAgentCollision/SystemConfig.xml b/sim/contrib/examples/Configurations/StaticAgentCollision/SystemConfig.xml index 001030480232580565534bafae571ce0df0f0837..68636924ad717ad78a88debef67ef3ae0efb99e3 100644 --- a/sim/contrib/examples/Configurations/StaticAgentCollision/SystemConfig.xml +++ b/sim/contrib/examples/Configurations/StaticAgentCollision/SystemConfig.xml @@ -411,7 +411,7 @@ <!--parameter's title: Inertia--> <id>Inertia</id> <type>doubleVector</type> - <unit>kgm²</unit> + <unit>kgm^2</unit> <value>2,2</value> </parameter> <parameter> diff --git a/sim/src/components/Dynamics_TireModel/Dynamics_TireModel.xml b/sim/src/components/Dynamics_TireModel/Dynamics_TireModel.xml index da4cd2efdb781a740ada9f2327b8575ed836e90d..762b7068027db15734a9e1eeaff23f06af09165c 100644 --- a/sim/src/components/Dynamics_TireModel/Dynamics_TireModel.xml +++ b/sim/src/components/Dynamics_TireModel/Dynamics_TireModel.xml @@ -2,7 +2,7 @@ <component> <type>Dynamics</type> <title>Dynamics_TireModel</title> - <library>Dynamics_TireModel</library> + <library>Dynamics_TireModel</library> <schedule> <offset>0</offset> <cycle>1</cycle> @@ -167,7 +167,7 @@ <id>Inertia</id> <type>doubleVector</type> <title>Inertia</title> - <unit>kgm²</unit> + <unit>kgm^2</unit> <value>2,2</value> </parameter> <parameter>