Skip to content
Snippets Groups Projects
Commit f8621dc5 authored by René Paris's avatar René Paris
Browse files

Merge branch 'develop' into 'main' 

Last fixes before releasing 1.2.0

Closes #290 and #291

See merge request !269
parents 779e8a31 fd8be472
No related branches found
No related tags found
3 merge requests!269Last fixes before releasing 1.2.0,!268fix(CI): let version check ignore 'v' prefix,!267fix(contrib): remove outdated and unused files
Pipeline #62113 failed
Stage: external
    Expand all Hide whitespace changes
    Inline Side-by-side
    sim/contrib/examples/Configurations/ADAS_AEB_CutIn/ProfilesCatalog_GUI.ui deleted 100644 → 0
    + 0
    − 131
    View file @ 779e8a31
    <?xml version="1.0" encoding="UTF-8"?>
    <Profiles>
    <AgentProfiles>
    <AgentProfile Name="EgoAgent" Type="Dynamic">
    <DriverProfiles>
    <DriverProfile Name="EgoDriver" Probability="1"/>
    </DriverProfiles>
    <VehicleProfiles>
    <VehicleProfile Name="EgoVehicle" Probability="1"/>
    </VehicleProfiles>
    </AgentProfile>
    <AgentProfile Name="LuxuryClassCarAgent" Type="Dynamic">
    <DriverProfiles>
    <DriverProfile Name="Regular" Probability="1"/>
    </DriverProfiles>
    <VehicleProfiles>
    <VehicleProfile Name="BMW 7 1" Probability="0.5"/>
    <VehicleProfile Name="BMW 7 2" Probability="0.5"/>
    </VehicleProfiles>
    </AgentProfile>
    <AgentProfile Name="MiddleClassCarAgent" Type="Dynamic">
    <DriverProfiles>
    <DriverProfile Name="Regular" Probability="1"/>
    </DriverProfiles>
    <VehicleProfiles>
    <VehicleProfile Name="BMW 3" Probability="0.3"/>
    <VehicleProfile Name="BMW i3" Probability="0.3"/>
    <VehicleProfile Name="Mini Cooper" Probability="0.4"/>
    </VehicleProfiles>
    </AgentProfile>
    <AgentProfile Name="TFAgent" Type="Dynamic">
    <DriverProfiles>
    <DriverProfile Name="Regular" Probability="1"/>
    </DriverProfiles>
    <VehicleProfiles>
    <VehicleProfile Name="TFVehicle" Probability="1"/>
    </VehicleProfiles>
    </AgentProfile>
    <AgentProfile Name="TruckAgent" Type="Dynamic">
    <DriverProfiles>
    <DriverProfile Name="Regular" Probability="1"/>
    </DriverProfiles>
    <VehicleProfiles>
    <VehicleProfile Name="Bus" Probability="0.5"/>
    <VehicleProfile Name="Truck" Probability="0.5"/>
    </VehicleProfiles>
    </AgentProfile>
    </AgentProfiles>
    <!--#############################################################################################-->
    <DriverProfiles>
    <DriverProfile Name="EgoDriver">
    <String Key="Type" Value="AlgorithmAgentFollowingDriverModel"/>
    <String Key="AlgorithmLateralModule" Value="Algorithm_LateralAfdm"/>
    <String Key="AlgorithmLongitudinalModule" Value="Algorithm_LongitudinalAfdm"/>
    <Double Key="VelocityWish" Value="35.0"/>
    <Double Key="Delta" Value="4.0"/>
    <Double Key="TGapWish" Value="1.5"/>
    <Double Key="MinDistance" Value="2.0"/>
    <Double Key="MaxAcceleration" Value="2.0"/>
    <Double Key="MaxDeceleration" Value="0.5"/>
    </DriverProfile>
    <DriverProfile Name="Regular">
    <String Key="Type" Value="AlgorithmAgentFollowingDriverModel"/>
    <String Key="AlgorithmLateralModule" Value="Algorithm_LateralAfdm"/>
    <String Key="AlgorithmLongitudinalModule" Value="Algorithm_LongitudinalAfdm"/>
    <Double Key="VelocityWish" Value="35.0"/>
    <Double Key="Delta" Value="4.0"/>
    <Double Key="TGapWish" Value="1.5"/>
    <Double Key="MinDistance" Value="2.0"/>
    <Double Key="MaxAcceleration" Value="1.4"/>
    <Double Key="MaxDeceleration" Value="2.0"/>
    </DriverProfile>
    </DriverProfiles>
    <!--#############################################################################################-->
    <VehicleProfiles>
    <VehicleProfile Name="BMW 3">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="car_bmw_3"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    <VehicleProfile Name="BMW 7 1">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="car_bmw_7_1"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    <VehicleProfile Name="BMW 7 2">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="car_bmw_7_2"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    <VehicleProfile Name="BMW i3">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="car_bmw_i3"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    <VehicleProfile Name="Bus">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="bus"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    <VehicleProfile Name="EgoVehicle">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="car_bmw_7_1"/>
    <SystemConfig Path="systemConfig.xml"/>
    <SystemProfiles>
    <SystemProfile Type="AEB">
    <System Id="0" Title="AebOSI" Probability="1"/>
    </SystemProfile>
    </SystemProfiles>
    </VehicleProfile>
    <VehicleProfile Name="Mini Cooper">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="car_mini_cooper"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    <VehicleProfile Name="TFVehicle">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="car_bmw_7_1"/>
    <SystemConfig Path="systemConfig.xml"/>
    <SystemProfiles>
    <SystemProfile Type="Dynamics_TrajectoryFollower">
    <System Id="1" Title="BasicTrajectoryFollower" Probability="1"/>
    </SystemProfile>
    </SystemProfiles>
    </VehicleProfile>
    <VehicleProfile Name="Truck">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="truck"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    </VehicleProfiles>
    <!--#############################################################################################-->
    </Profiles>
    sim/contrib/examples/Configurations/PCM/sceneryConfiguration.xml deleted 100644 → 0
    + 0
    − 1658
    View file @ 779e8a31
    This diff is collapsed.
    sim/contrib/examples/Configurations/StaticAgentCollision/ProfilesCatalog_GUI.ui deleted 100644 → 0
    + 0
    − 97
    View file @ 779e8a31
    <?xml version="1.0" encoding="UTF-8"?>
    <Profiles>
    <AgentProfiles>
    <AgentProfile Name="EgoAgent" Type="Static">
    <System>
    <File>SystemConfig.xml</File>
    <Id>0</Id>
    </System>
    <VehicleModel>
    <VehicleModelCatalogue>VehicleModelsCatalog.xosc</VehicleModelCatalogue>
    <Model>car_bmw_7_1</Model>
    </VehicleModel>
    </AgentProfile>
    <AgentProfile Name="LuxuryClassCarAgent" Type="Static">
    <System>
    <File>SystemConfig.xml</File>
    <Id>0</Id>
    </System>
    <VehicleModel>
    <VehicleModelCatalogue>VehicleModelsCatalog.xosc</VehicleModelCatalogue>
    <Model>car_bmw_7_2</Model>
    </VehicleModel>
    </AgentProfile>
    <AgentProfile Name="MiddleClassCarAgent" Type="Dynamic">
    <DriverProfiles>
    <DriverProfile Name="Regular" Probability="1"/>
    </DriverProfiles>
    <VehicleProfiles>
    <VehicleProfile Name="BMW 3" Probability="0.3"/>
    <VehicleProfile Name="BMW i3" Probability="0.3"/>
    <VehicleProfile Name="Mini Cooper" Probability="0.4"/>
    </VehicleProfiles>
    </AgentProfile>
    <AgentProfile Name="TruckAgent" Type="Dynamic">
    <DriverProfiles>
    <DriverProfile Name="Regular" Probability="1"/>
    </DriverProfiles>
    <VehicleProfiles>
    <VehicleProfile Name="Bus" Probability="0.5"/>
    <VehicleProfile Name="Truck" Probability="0.5"/>
    </VehicleProfiles>
    </AgentProfile>
    </AgentProfiles>
    <!--#############################################################################################-->
    <DriverProfiles>
    <DriverProfile Name="Regular">
    <String Key="Type" Value="AlgorithmAgentFollowingDriverModel"/>
    <String Key="AlgorithmLateralModule" Value="Algorithm_LateralAfdm"/>
    <String Key="AlgorithmLongitudinalModule" Value="Algorithm_LongitudinalAfdm"/>
    <Double Key="VelocityWish" Value="35.0"/>
    <Double Key="Delta" Value="4.0"/>
    <Double Key="TGapWish" Value="1.5"/>
    <Double Key="MinDistance" Value="2.0"/>
    <Double Key="MaxAcceleration" Value="1.4"/>
    <Double Key="MaxDeceleration" Value="2.0"/>
    </DriverProfile>
    </DriverProfiles>
    <!--#############################################################################################-->
    <VehicleProfiles>
    <VehicleProfile Name="BMW 3">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="car_bmw_3"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    <VehicleProfile Name="BMW 7 1">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="car_bmw_7_1"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    <VehicleProfile Name="BMW 7 2">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="car_bmw_7_2"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    <VehicleProfile Name="BMW i3">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="car_bmw_i3"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    <VehicleProfile Name="Bus">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="bus"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    <VehicleProfile Name="Mini Cooper">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="car_mini_cooper"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    <VehicleProfile Name="Truck">
    <Model Catalogue="VehicleModelsCatalog.xosc" Name="truck"/>
    <SystemConfig Path=""/>
    <SystemProfiles/>
    </VehicleProfile>
    </VehicleProfiles>
    <!--#############################################################################################-->
    </Profiles>
    utils/ci/scripts/89_check_version.sh
    + 2
    − 2
    View file @ f8621dc5
    ...@@ -39,8 +39,8 @@ if [[ $exit_status -ne 0 ]]; then ...@@ -39,8 +39,8 @@ if [[ $exit_status -ne 0 ]]; then
    exit 1 exit 1
    fi fi
    # Check if the output is exactly the tag name # Check if the output is exactly the tag name (ignoring 'v' prefix)
    if [[ "$version_output" == *"${TAG_NAME}" ]]; then if [[ "${version_output#v}" == "${TAG_NAME#v}" ]]; then
    echo "Version is correctly set: $version_output" echo "Version is correctly set: $version_output"
    else else
    echo "Version is falsely set: $version_output" echo "Version is falsely set: $version_output"
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment

    Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent