diff --git a/examples/__init__.py b/examples/__init__.py index e423243..2bd0b10 100644 --- a/examples/__init__.py +++ b/examples/__init__.py @@ -1,6 +1,6 @@ -""" Here a number of examples for the scenariogeneration package are presented. The source-code for all can also be found on github +"""Here a number of examples for the scenariogeneration package are presented. The source-code for all can also be found on github - The examples are devided into three parts, relating to the different sub-modules. +The examples are devided into three parts, relating to the different sub-modules. - The xodr module contains examples of different level, where some are more from a developer point of view, and the high leve exampels for the user point of view. +The xodr module contains examples of different level, where some are more from a developer point of view, and the high leve exampels for the user point of view. """ diff --git a/examples/generator/CCRb.py b/examples/generator/CCRb.py index 48a77dc..feca5dd 100644 --- a/examples/generator/CCRb.py +++ b/examples/generator/CCRb.py @@ -1,24 +1,24 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - example of how to write the EUNCAP2020 CCRb tests in a parametrized maner + example of how to write the EUNCAP2020 CCRb tests in a parametrized maner - Some features used: + Some features used: - - ScenarioGenerator + - ScenarioGenerator - - (ScenarioGenerator).naming + - (ScenarioGenerator).naming - - (ScenarioGenerator).generate_all_roads + - (ScenarioGenerator).generate_all_roads - - (ScenarioGenerator).parameters + - (ScenarioGenerator).parameters """ diff --git a/examples/generator/CCRm.py b/examples/generator/CCRm.py index 24c10c6..a6e78ec 100644 --- a/examples/generator/CCRm.py +++ b/examples/generator/CCRm.py @@ -1,25 +1,25 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - example of how to write the EUNCAP2020 CCRm tests in a parametrized maner + example of how to write the EUNCAP2020 CCRm tests in a parametrized maner - Some features used: + Some features used: - - ScenarioGenerator + - ScenarioGenerator - - (ScenarioGenerator).naming + - (ScenarioGenerator).naming - - (ScenarioGenerator).generate_all_roads + - (ScenarioGenerator).generate_all_roads - - (ScenarioGenerator).parameters + - (ScenarioGenerator).parameters """ diff --git a/examples/generator/CCRs.py b/examples/generator/CCRs.py index f6f880e..be34c7d 100644 --- a/examples/generator/CCRs.py +++ b/examples/generator/CCRs.py @@ -1,24 +1,24 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - example of how to write the EUNCAP2020 CCRs tests in a parametrized maner + example of how to write the EUNCAP2020 CCRs tests in a parametrized maner - Some features used: + Some features used: - - ScenarioGenerator + - ScenarioGenerator - - (ScenarioGenerator).naming + - (ScenarioGenerator).naming - - (ScenarioGenerator).generate_all_roads + - (ScenarioGenerator).generate_all_roads - - (ScenarioGenerator).parameters + - (ScenarioGenerator).parameters """ diff --git a/examples/generator/generate_from_main.py b/examples/generator/generate_from_main.py index cb274d5..e325049 100644 --- a/examples/generator/generate_from_main.py +++ b/examples/generator/generate_from_main.py @@ -1,18 +1,18 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. - - Copyright (c) 2022 The scenariogeneration Authors. +scenariogeneration +https://github.com/pyoscx/scenariogeneration - example of creating OpenSCENARIO and OpenDRIVE file, with the parameters defined outside the class structure +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Example usage: when a itterative procedure is defined and the parameters to the Scenario will change +Copyright (c) 2022 The scenariogeneration Authors. - Will generate 9 scenarios + example of creating OpenSCENARIO and OpenDRIVE file, with the parameters defined outside the class structure + + Example usage: when a itterative procedure is defined and the parameters to the Scenario will change + + Will generate 9 scenarios """ from scenariogeneration import xodr diff --git a/examples/generator/generate_with_fixed_parameter_sets.py b/examples/generator/generate_with_fixed_parameter_sets.py index e2daf30..eed0da0 100644 --- a/examples/generator/generate_with_fixed_parameter_sets.py +++ b/examples/generator/generate_with_fixed_parameter_sets.py @@ -1,18 +1,18 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. - - Copyright (c) 2022 The scenariogeneration Authors. - - Example of creating OpenSCENARIO and OpenDRIVE files with a fixed set of dictionaries that will generate the scenarios and roads - - Example usage: when very precise permutations of a scenario is wanted - - Will generate 2 different scenarios and roads. +scenariogeneration +https://github.com/pyoscx/scenariogeneration + +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. + +Copyright (c) 2022 The scenariogeneration Authors. + + Example of creating OpenSCENARIO and OpenDRIVE files with a fixed set of dictionaries that will generate the scenarios and roads + + Example usage: when very precise permutations of a scenario is wanted + + Will generate 2 different scenarios and roads. """ from scenariogeneration import xodr diff --git a/examples/generator/generate_with_permutations.py b/examples/generator/generate_with_permutations.py index cf5261d..38ff2f2 100644 --- a/examples/generator/generate_with_permutations.py +++ b/examples/generator/generate_with_permutations.py @@ -1,19 +1,19 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example of creating OpenSCENARIO and OpenDRIVE files with parameter sweep type of input + Example of creating OpenSCENARIO and OpenDRIVE files with parameter sweep type of input - Example usage: When a parameter sweep is wanted with minimal input - Using the generate_all_roads feature which will only generate unique roads + Example usage: When a parameter sweep is wanted with minimal input + Using the generate_all_roads feature which will only generate unique roads - Will generate 12 different scenarios and 4 different roads. + Will generate 12 different scenarios and 4 different roads. """ from scenariogeneration import xodr diff --git a/examples/xodr/adjustable_planview.py b/examples/xodr/adjustable_planview.py index f687c1d..899f1cb 100644 --- a/examples/xodr/adjustable_planview.py +++ b/examples/xodr/adjustable_planview.py @@ -1,21 +1,21 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2023 The scenariogeneration Authors. +Copyright (c) 2023 The scenariogeneration Authors. - Example how to utilze AdjustablePlanview to make a loop with to difficult geometries to manually calculate + Example how to utilze AdjustablePlanview to make a loop with to difficult geometries to manually calculate - Some features used: + Some features used: - - AdjustablePlanview + - AdjustablePlanview - - CommonJunctionCreator + - CommonJunctionCreator """ diff --git a/examples/xodr/clothoid_generation.py b/examples/xodr/clothoid_generation.py index 5bbd6e9..cd848fb 100644 --- a/examples/xodr/clothoid_generation.py +++ b/examples/xodr/clothoid_generation.py @@ -1,21 +1,21 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2023 The scenariogeneration Authors. +Copyright (c) 2023 The scenariogeneration Authors. - Example how to utilze pyclothoids to create a road to match two points + Example how to utilze pyclothoids to create a road to match two points - Some features used: + Some features used: - - create_road + - create_road - - pyclothoids* (external package) + - pyclothoids* (external package) """ diff --git a/examples/xodr/common_junction_creator.py b/examples/xodr/common_junction_creator.py index 140d2ea..591db17 100644 --- a/examples/xodr/common_junction_creator.py +++ b/examples/xodr/common_junction_creator.py @@ -1,23 +1,23 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example of how to create a highway entry using CommonJunctionCreator + Example of how to create a highway entry using CommonJunctionCreator - Some features used: + Some features used: - - create_road + - create_road - - add_successor/add_predecessor with and without the lane_offset option, and the direct_junction input + - add_successor/add_predecessor with and without the lane_offset option, and the direct_junction input - - CommonJunctionCreator + - CommonJunctionCreator """ import os diff --git a/examples/xodr/direct_junction_creator.py b/examples/xodr/direct_junction_creator.py index 468ff4d..87aaaf9 100644 --- a/examples/xodr/direct_junction_creator.py +++ b/examples/xodr/direct_junction_creator.py @@ -1,23 +1,23 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example of how to create a highway exits using DirectJunctionCreator + Example of how to create a highway exits using DirectJunctionCreator - Some features used: + Some features used: - - create_road + - create_road - - add_successor/add_predecessor with and without the lane_offset option, and the direct_junction input + - add_successor/add_predecessor with and without the lane_offset option, and the direct_junction input - - DirectJunctionCreator + - DirectJunctionCreator """ import os diff --git a/examples/xodr/full_junction.py b/examples/xodr/full_junction.py index 9f191a4..3cdb8a0 100644 --- a/examples/xodr/full_junction.py +++ b/examples/xodr/full_junction.py @@ -1,23 +1,23 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - An example, using the generators, showing how to create different symetric junctions, - the numintersections can be changed to create different junctions + An example, using the generators, showing how to create different symetric junctions, + the numintersections can be changed to create different junctions - In this example we can create a junction given + In this example we can create a junction given - Some features used: + Some features used: - - create_road + - create_road - - CommonJunctionCreator + - CommonJunctionCreator """ diff --git a/examples/xodr/full_junction_with_LaneDef.py b/examples/xodr/full_junction_with_LaneDef.py index f0aa4af..6451ee1 100644 --- a/examples/xodr/full_junction_with_LaneDef.py +++ b/examples/xodr/full_junction_with_LaneDef.py @@ -1,23 +1,23 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example how to create a more customized a junction with different widths of lanes, - using generators and LaneDef with different lane widths + Example how to create a more customized a junction with different widths of lanes, + using generators and LaneDef with different lane widths - Some features used + Some features used - - CommonJunctionCreator + - CommonJunctionCreator - - LaneDef + - LaneDef - - create_road + - create_road """ from scenariogeneration import xodr, prettyprint, ScenarioGenerator diff --git a/examples/xodr/highway_bridge_example.py b/examples/xodr/highway_bridge_example.py index afe67ef..439b030 100644 --- a/examples/xodr/highway_bridge_example.py +++ b/examples/xodr/highway_bridge_example.py @@ -1,24 +1,24 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example of how to create a highway with a bridge using DirectJunctionCreator, and CommonJunctionCreator + Example of how to create a highway with a bridge using DirectJunctionCreator, and CommonJunctionCreator - Some features used: + Some features used: - - create_road + - create_road - - add_successor/add_predecessor with and without the lane_offset option, and the direct_junction input + - add_successor/add_predecessor with and without the lane_offset option, and the direct_junction input - - DirectJunctionCreator + - DirectJunctionCreator - - CommonJunctionCreator + - CommonJunctionCreator """ from scenariogeneration import xodr, prettyprint, ScenarioGenerator diff --git a/examples/xodr/highway_example.py b/examples/xodr/highway_example.py index a1822bf..2a9b99b 100644 --- a/examples/xodr/highway_example.py +++ b/examples/xodr/highway_example.py @@ -1,24 +1,24 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - An example, using the generators, showing how to create a simple highway with exits and entries + An example, using the generators, showing how to create a simple highway with exits and entries - Shows how to patch created roads together with successor/predecessor, together with the lane_offset option + Shows how to patch created roads together with successor/predecessor, together with the lane_offset option - Some features used: + Some features used: - - create_road + - create_road - - add_successor/add_predecessor with and without the lane_offset option + - add_successor/add_predecessor with and without the lane_offset option - - create_junction + - create_junction """ from scenariogeneration import xodr, prettyprint, ScenarioGenerator diff --git a/examples/xodr/highway_example_with_merge_and_split.py b/examples/xodr/highway_example_with_merge_and_split.py index cd158b7..cbc5198 100644 --- a/examples/xodr/highway_example_with_merge_and_split.py +++ b/examples/xodr/highway_example_with_merge_and_split.py @@ -1,26 +1,26 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - An example, using the generators, showing how to create a highway with exits and entries, that has their own entry and exit lanes + An example, using the generators, showing how to create a highway with exits and entries, that has their own entry and exit lanes - Shows how to patch created roads together with successor/predecessor, together with the lane_offset option + Shows how to patch created roads together with successor/predecessor, together with the lane_offset option - Some features used: + Some features used: - - create_road + - create_road - - LaneDef (not a real OpenDrive definition but a helper for the xodr module) + - LaneDef (not a real OpenDrive definition but a helper for the xodr module) - - add_successor/add_predecessor with and without the lane_offset option + - add_successor/add_predecessor with and without the lane_offset option - - create_junction + - create_junction """ diff --git a/examples/xodr/highway_exit_with_lane_types.py b/examples/xodr/highway_exit_with_lane_types.py index ce23a51..4310fdf 100644 --- a/examples/xodr/highway_exit_with_lane_types.py +++ b/examples/xodr/highway_exit_with_lane_types.py @@ -1,28 +1,28 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - An example, using the generators, showing how to create a simple highway with exits and entries + An example, using the generators, showing how to create a simple highway with exits and entries - Shows how to patch created roads together with successor/predecessor, together with the lane_offset option + Shows how to patch created roads together with successor/predecessor, together with the lane_offset option - Some features used: + Some features used: - - create_road + - create_road - - add_successor/add_predecessor with and without the lane_offset option + - add_successor/add_predecessor with and without the lane_offset option - - LaneDef + - LaneDef - - LaneType + - LaneType - - DirectJunctionCreator + - DirectJunctionCreator """ from scenariogeneration import xodr, prettyprint, ScenarioGenerator diff --git a/examples/xodr/junction_trippel_twoway.py b/examples/xodr/junction_trippel_twoway.py index 9db1665..4ce566c 100644 --- a/examples/xodr/junction_trippel_twoway.py +++ b/examples/xodr/junction_trippel_twoway.py @@ -1,16 +1,16 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - This example shows how to make a very simple junction from "scratch" without using any generators. +This example shows how to make a very simple junction from "scratch" without using any generators. - NOTE: This is more of a reference example and should not be considered a "user example" more of a "developer example". + NOTE: This is more of a reference example and should not be considered a "user example" more of a "developer example". """ diff --git a/examples/xodr/junction_with_signals.py b/examples/xodr/junction_with_signals.py index b798c51..8ba25a1 100644 --- a/examples/xodr/junction_with_signals.py +++ b/examples/xodr/junction_with_signals.py @@ -1,14 +1,14 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example of how to create a junction but adding signals to the junction + Example of how to create a junction but adding signals to the junction """ diff --git a/examples/xodr/junction_with_varying_lane_widths.py b/examples/xodr/junction_with_varying_lane_widths.py index aee6791..71d5f74 100644 --- a/examples/xodr/junction_with_varying_lane_widths.py +++ b/examples/xodr/junction_with_varying_lane_widths.py @@ -1,20 +1,20 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example how to create a more customized junction with different widths of lanes, using basic classes + Example how to create a more customized junction with different widths of lanes, using basic classes - Some features used + Some features used - - CommonJunctionCreator + - CommonJunctionCreator - - Lane + - Lane """ from scenariogeneration import xodr, prettyprint, ScenarioGenerator diff --git a/examples/xodr/lane_number_change_merge.py b/examples/xodr/lane_number_change_merge.py index f0e91e7..914e759 100644 --- a/examples/xodr/lane_number_change_merge.py +++ b/examples/xodr/lane_number_change_merge.py @@ -1,31 +1,31 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example how to create a road with a lanemerge. + Example how to create a road with a lanemerge. - Simple cases can automated with create_road and LaneDef, but for complex cases this example shows how to do it from scratch. - This example makes use of the LaneLinker class that is not part of OpenDRIVE but a helper class for the xodr module + Simple cases can automated with create_road and LaneDef, but for complex cases this example shows how to do it from scratch. + This example makes use of the LaneLinker class that is not part of OpenDRIVE but a helper class for the xodr module - Some features used: + Some features used: - - PlanView + - PlanView - - RoadMark + - RoadMark - - Lane + - Lane - - LaneSection + - LaneSection - - Lanes + - Lanes - - LaneLinker + - LaneLinker """ from scenariogeneration import xodr, prettyprint, ScenarioGenerator diff --git a/examples/xodr/manual_add_of_geometries.py b/examples/xodr/manual_add_of_geometries.py index c36c59a..a841b3a 100644 --- a/examples/xodr/manual_add_of_geometries.py +++ b/examples/xodr/manual_add_of_geometries.py @@ -1,32 +1,32 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example how to add geometries with a fixed position, please note that *adjust_roads_and_lanes* will only take care of the lane linking in this case not any geometrical adjustmensts + Example how to add geometries with a fixed position, please note that *adjust_roads_and_lanes* will only take care of the lane linking in this case not any geometrical adjustmensts - This is how a road can be built up if all exact postions of the geometries are already known + This is how a road can be built up if all exact postions of the geometries are already known - Some features used: + Some features used: - - PlanView + - PlanView - - (PlanView).add_fixed_geometry + - (PlanView).add_fixed_geometry - - RoadMark + - RoadMark - - Lane + - Lane - - LaneSection + - LaneSection - - Lanes + - Lanes - - LaneLinker + - LaneLinker """ import os diff --git a/examples/xodr/multiple_geometries_one_road.py b/examples/xodr/multiple_geometries_one_road.py index db5c43e..12bb3f2 100644 --- a/examples/xodr/multiple_geometries_one_road.py +++ b/examples/xodr/multiple_geometries_one_road.py @@ -1,31 +1,31 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Fundamental example how to build up a road from scratch. + Fundamental example how to build up a road from scratch. - This example should be seen as a developer example how roads are built up from the very basic classes in OpenDRIVE - create_road will take care of this and much more, so a user is recommended to use that generator instead. + This example should be seen as a developer example how roads are built up from the very basic classes in OpenDRIVE + create_road will take care of this and much more, so a user is recommended to use that generator instead. - Some features used: + Some features used: - - PlanView + - PlanView - - Lane + - Lane - - Lanes + - Lanes - - LaneSection + - LaneSection - - RoadMark + - RoadMark - - Road + - Road """ diff --git a/examples/xodr/multiple_geometries_one_road_with_objects.py b/examples/xodr/multiple_geometries_one_road_with_objects.py index 91ff5b8..23bdbee 100644 --- a/examples/xodr/multiple_geometries_one_road_with_objects.py +++ b/examples/xodr/multiple_geometries_one_road_with_objects.py @@ -1,33 +1,33 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Fundamental example how to build up a road from scratch, but also with objects. + Fundamental example how to build up a road from scratch, but also with objects. - This example should be seen as a developer example how roads are built up from the very basic classes in OpenDRIVE - create_road will take care of this and much more, so a user is recommended to use that generator instead. + This example should be seen as a developer example how roads are built up from the very basic classes in OpenDRIVE + create_road will take care of this and much more, so a user is recommended to use that generator instead. - Some features used: + Some features used: - - Object + - Object - - PlanView + - PlanView - - Lane + - Lane - - Lanes + - Lanes - - LaneSection + - LaneSection - - RoadMark + - RoadMark - - Road + - Road """ diff --git a/examples/xodr/road_link_unequal_number_of_lanes.py b/examples/xodr/road_link_unequal_number_of_lanes.py index b64c5fb..3bbd135 100644 --- a/examples/xodr/road_link_unequal_number_of_lanes.py +++ b/examples/xodr/road_link_unequal_number_of_lanes.py @@ -1,18 +1,18 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example for linking two roads with an unequal number of lanes. + Example for linking two roads with an unequal number of lanes. - Note: This is possible and valid according to the OpenDRIVE standard. It is - sometimes necessary to use this approach but it might often be prefered to begin - a new lane section to change the number of lanes instead. + Note: This is possible and valid according to the OpenDRIVE standard. It is + sometimes necessary to use this approach but it might often be prefered to begin + a new lane section to change the number of lanes instead. """ from scenariogeneration import xodr, prettyprint, ScenarioGenerator diff --git a/examples/xodr/road_merge.py b/examples/xodr/road_merge.py index 3ac3ef1..5c8bf20 100644 --- a/examples/xodr/road_merge.py +++ b/examples/xodr/road_merge.py @@ -1,22 +1,22 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example how to create a simple road merge through a junction + Example how to create a simple road merge through a junction - Some features used + Some features used - - create_road + - create_road - - add_successor/add_predecessor with lane_offset + - add_successor/add_predecessor with lane_offset - - create_junction + - create_junction """ diff --git a/examples/xodr/road_merge_w_lane_merge.py b/examples/xodr/road_merge_w_lane_merge.py index aeeaaf7..c6d7f07 100644 --- a/examples/xodr/road_merge_w_lane_merge.py +++ b/examples/xodr/road_merge_w_lane_merge.py @@ -1,28 +1,28 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Fundamental example how to build up a road merge with lane merge afterwards. + Fundamental example how to build up a road merge with lane merge afterwards. - This simple example could be handled with the LaneDef (as in highway_example_with_merge_and_split.py) + This simple example could be handled with the LaneDef (as in highway_example_with_merge_and_split.py) - This example should be seen as a way to create your own complex merge case that the LaneDef + create_road cannot handle + This example should be seen as a way to create your own complex merge case that the LaneDef + create_road cannot handle - Some features used: + Some features used: - - create_road + - create_road - - lane_offset + - lane_offset - - LaneSection + - LaneSection - - Lanes + - Lanes """ diff --git a/examples/xodr/road_split.py b/examples/xodr/road_split.py index f27ea92..c39c056 100644 --- a/examples/xodr/road_split.py +++ b/examples/xodr/road_split.py @@ -1,22 +1,22 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example how to create a simple road split through a junction + Example how to create a simple road split through a junction - Some features used + Some features used - - create_road + - create_road - - add_successor/add_predecessor with lane_offset + - add_successor/add_predecessor with lane_offset - - create_junction + - create_junction """ diff --git a/examples/xodr/road_split_w_lane_split.py b/examples/xodr/road_split_w_lane_split.py index e1728a3..61d4593 100644 --- a/examples/xodr/road_split_w_lane_split.py +++ b/examples/xodr/road_split_w_lane_split.py @@ -1,30 +1,30 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Fundamental example how to build up a road split with lane split afterwards. + Fundamental example how to build up a road split with lane split afterwards. - This simple example could be handled with the LaneDef (as in highway_example_with_merge_and_split.py) + This simple example could be handled with the LaneDef (as in highway_example_with_merge_and_split.py) - This example should be seen as a way to create your own complex split case that the LaneDef + create_road cannot handle + This example should be seen as a way to create your own complex split case that the LaneDef + create_road cannot handle - Some features used: + Some features used: - - create_road + - create_road - - lane_offset + - lane_offset - - LaneSection + - LaneSection - - Lanes + - Lanes - - LaneLinker + - LaneLinker """ diff --git a/examples/xodr/road_with_changing_lane_width.py b/examples/xodr/road_with_changing_lane_width.py index e61ab17..361953e 100644 --- a/examples/xodr/road_with_changing_lane_width.py +++ b/examples/xodr/road_with_changing_lane_width.py @@ -1,18 +1,18 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example how to create a more customized road with different widths + Example how to create a more customized road with different widths - Some features used + Some features used - - create_road with lane_width_end + - create_road with lane_width_end """ diff --git a/examples/xodr/road_with_custom_lanes.py b/examples/xodr/road_with_custom_lanes.py index f30ab14..ecb4686 100644 --- a/examples/xodr/road_with_custom_lanes.py +++ b/examples/xodr/road_with_custom_lanes.py @@ -1,20 +1,20 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example how to create roads with custom lanes to the left and right + Example how to create roads with custom lanes to the left and right - Some features used + Some features used - - PlanView + - PlanView - - LaneSection + - LaneSection """ diff --git a/examples/xodr/road_with_custom_roadmarkers.py b/examples/xodr/road_with_custom_roadmarkers.py index 5898e0e..1f56021 100644 --- a/examples/xodr/road_with_custom_roadmarkers.py +++ b/examples/xodr/road_with_custom_roadmarkers.py @@ -1,24 +1,24 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example how to create roads with customized centerline for double road markers + Example how to create roads with customized centerline for double road markers - Some features used + Some features used - - PlanView + - PlanView - - LaneSection + - LaneSection - - RoadMark + - RoadMark - - RoadLine + - RoadLine """ diff --git a/examples/xodr/road_with_lane_adjustment.py b/examples/xodr/road_with_lane_adjustment.py index 7f86587..1359409 100644 --- a/examples/xodr/road_with_lane_adjustment.py +++ b/examples/xodr/road_with_lane_adjustment.py @@ -1,27 +1,27 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example how to create a more customized a junction with different widths of lanes, - using generators and LaneDef with different lane widths + Example how to create a more customized a junction with different widths of lanes, + using generators and LaneDef with different lane widths - Some features used + Some features used - - CommonJunctionCreator + - CommonJunctionCreator - - DirectJunctionCreator + - DirectJunctionCreator - - LaneDef + - LaneDef - - create_road + - create_road - - adjust_roadmarks + - adjust_roadmarks """ from scenariogeneration import xodr, prettyprint, ScenarioGenerator diff --git a/examples/xodr/road_with_multiple_lane_widths.py b/examples/xodr/road_with_multiple_lane_widths.py index 7bcf65a..10be3f8 100644 --- a/examples/xodr/road_with_multiple_lane_widths.py +++ b/examples/xodr/road_with_multiple_lane_widths.py @@ -1,20 +1,20 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example how to create a more customized road with different widths + Example how to create a more customized road with different widths - Some features used + Some features used - - create_road + - create_road - - add_lane_width + - add_lane_width """ diff --git a/examples/xodr/road_with_speed_signs.py b/examples/xodr/road_with_speed_signs.py index 0673c54..082b435 100644 --- a/examples/xodr/road_with_speed_signs.py +++ b/examples/xodr/road_with_speed_signs.py @@ -1,21 +1,21 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example how to create a more customized a junction with different widths of lanes, - using generators and LaneDef with different lane widths + Example how to create a more customized a junction with different widths of lanes, + using generators and LaneDef with different lane widths - Some features used + Some features used - - create_road + - create_road - - Signal + - Signal """ from scenariogeneration import xodr, prettyprint, ScenarioGenerator diff --git a/examples/xodr/simple_road_with_objects.py b/examples/xodr/simple_road_with_objects.py index 315a285..338d49a 100644 --- a/examples/xodr/simple_road_with_objects.py +++ b/examples/xodr/simple_road_with_objects.py @@ -1,25 +1,25 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Fundamental example how to build up a road from scratch, but also with objects. + Fundamental example how to build up a road from scratch, but also with objects. - This example should be seen as a developer example how roads are built up from the very basic classes in OpenDRIVE - create_road will take care of this and much more, so a user is recommended to use that generator instead. + This example should be seen as a developer example how roads are built up from the very basic classes in OpenDRIVE + create_road will take care of this and much more, so a user is recommended to use that generator instead. - Some features used: + Some features used: - - Object + - Object - - create_road + - create_road - - (Object).repeat + - (Object).repeat """ from scenariogeneration import xodr, prettyprint, ScenarioGenerator diff --git a/examples/xodr/two_roads.py b/examples/xodr/two_roads.py index 5f62e15..24fd3bc 100644 --- a/examples/xodr/two_roads.py +++ b/examples/xodr/two_roads.py @@ -1,18 +1,18 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example showing how to create two separate roads (that are not linked), hence adjust_roads_and_lanes will not be able to set the geometries without a similar approach. + Example showing how to create two separate roads (that are not linked), hence adjust_roads_and_lanes will not be able to set the geometries without a similar approach. - Some features used: + Some features used: - - PlanView + - PlanView """ diff --git a/examples/xosc/Acceleration_condition.py b/examples/xosc/Acceleration_condition.py index 729bae4..ea849b3 100644 --- a/examples/xosc/Acceleration_condition.py +++ b/examples/xosc/Acceleration_condition.py @@ -1,25 +1,25 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example showing how one vehicle triggers based on the acceleration of another vehicle, then changes its speed. + Example showing how one vehicle triggers based on the acceleration of another vehicle, then changes its speed. - Some features used: + Some features used: - - AccelerationCondition + - AccelerationCondition - - StandStillCondition + - StandStillCondition - - RelativeRoadPosition + - RelativeRoadPosition - - AbsoluteSpeedAction + - AbsoluteSpeedAction """ diff --git a/examples/xosc/ParameterValueDistribution.py b/examples/xosc/ParameterValueDistribution.py index 992e29d..c1923ea 100644 --- a/examples/xosc/ParameterValueDistribution.py +++ b/examples/xosc/ParameterValueDistribution.py @@ -1,24 +1,24 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. - - Copyright (c) 2022 The scenariogeneration Authors. - - Example showing how one vehicle triggers based on the acceleration of another vehicle, then changes its speed. +scenariogeneration +https://github.com/pyoscx/scenariogeneration - Some features used: +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - - ParameterValueDistribution +Copyright (c) 2022 The scenariogeneration Authors. - - Stocastic + Example showing how one vehicle triggers based on the acceleration of another vehicle, then changes its speed. - - NormalDistribution + Some features used: - - Histogram + - ParameterValueDistribution + + - Stocastic + + - NormalDistribution + + - Histogram """ diff --git a/examples/xosc/Speed_condition.py b/examples/xosc/Speed_condition.py index 12b10a7..acc803e 100644 --- a/examples/xosc/Speed_condition.py +++ b/examples/xosc/Speed_condition.py @@ -1,22 +1,22 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Simple example showing how one vehicle triggers based on the speed of another vehicle, then changes its speed + Simple example showing how one vehicle triggers based on the speed of another vehicle, then changes its speed - Some features used: + Some features used: - - SpeedCondition + - SpeedCondition - - AbsoluteSpeedAction + - AbsoluteSpeedAction - - RoadPosition + - RoadPosition """ diff --git a/examples/xosc/Stop_on_offroad.py b/examples/xosc/Stop_on_offroad.py index 0d3205e..1e30407 100644 --- a/examples/xosc/Stop_on_offroad.py +++ b/examples/xosc/Stop_on_offroad.py @@ -1,24 +1,24 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Simple example showing how one vehicle triggers based on the speed of another vehicle, then changes its speed + Simple example showing how one vehicle triggers based on the speed of another vehicle, then changes its speed - Some features used: + Some features used: - - SpeedCondition + - SpeedCondition - - AbsoluteSpeedAction + - AbsoluteSpeedAction - - RoadPosition + - RoadPosition - - OffroadCondition + - OffroadCondition """ import os diff --git a/examples/xosc/catalog_example.py b/examples/xosc/catalog_example.py index c1d8980..7178b10 100644 --- a/examples/xosc/catalog_example.py +++ b/examples/xosc/catalog_example.py @@ -1,24 +1,24 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. - - Copyright (c) 2022 The scenariogeneration Authors. - - Example of how to create a vehicle catalog - The properties are added in order to work with esmini 1.5-1.7 +scenariogeneration +https://github.com/pyoscx/scenariogeneration +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Some features used: +Copyright (c) 2022 The scenariogeneration Authors. - - Vehicle + Example of how to create a vehicle catalog + The properties are added in order to work with esmini 1.5-1.7 - - BoundingBox - - Axle + Some features used: + + - Vehicle + + - BoundingBox + + - Axle """ diff --git a/examples/xosc/end_of_road_reset_traffic.py b/examples/xosc/end_of_road_reset_traffic.py index 49f4160..ae93ec4 100644 --- a/examples/xosc/end_of_road_reset_traffic.py +++ b/examples/xosc/end_of_road_reset_traffic.py @@ -1,24 +1,24 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example showing how to create "repeating traffic" if a car goes to the end of the road + Example showing how to create "repeating traffic" if a car goes to the end of the road - Some features used: + Some features used: - - multiple execusions + - multiple execusions - - EndOfRoadCondition + - EndOfRoadCondition - - Teleport + - Teleport - - LanePosition + - LanePosition """ diff --git a/examples/xosc/multi_conditional_and_triggers.py b/examples/xosc/multi_conditional_and_triggers.py index e2a32ca..1ba27f8 100644 --- a/examples/xosc/multi_conditional_and_triggers.py +++ b/examples/xosc/multi_conditional_and_triggers.py @@ -1,25 +1,25 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - An example showing how a "and logic" for conditions can be created, the blue car has to pass the white one for it to stop + An example showing how a "and logic" for conditions can be created, the blue car has to pass the white one for it to stop - Some features used: + Some features used: - - ConditionGroup + - ConditionGroup - - TimeToCollisionCondition + - TimeToCollisionCondition - - TimeHeadwayCondition + - TimeHeadwayCondition - - AbsoluteSpeedAction + - AbsoluteSpeedAction """ diff --git a/examples/xosc/multi_conditional_different_actions.py b/examples/xosc/multi_conditional_different_actions.py index 77a4c24..9e2e33c 100644 --- a/examples/xosc/multi_conditional_different_actions.py +++ b/examples/xosc/multi_conditional_different_actions.py @@ -1,29 +1,29 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - An example showing how to setup a choise for one vehicle depending on what is happening around it, using multi conditions with different rules + An example showing how to setup a choise for one vehicle depending on what is happening around it, using multi conditions with different rules - for different behaviour change speed_of_outer_car + for different behaviour change speed_of_outer_car - Some features used: - - ConditionGroup + Some features used: + - ConditionGroup - - TimeToCollisionCondition + - TimeToCollisionCondition - - TimeHeadwayCondition + - TimeHeadwayCondition - - AbsoluteSpeedAction + - AbsoluteSpeedAction - - AbsoluteLaneChangeAction + - AbsoluteLaneChangeAction - - Rule + - Rule """ diff --git a/examples/xosc/multi_conditional_or_triggers.py b/examples/xosc/multi_conditional_or_triggers.py index 21f3e18..27ccb0d 100644 --- a/examples/xosc/multi_conditional_or_triggers.py +++ b/examples/xosc/multi_conditional_or_triggers.py @@ -1,26 +1,26 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - An example showing how a "or logic" for conditions can be created, and one action can be triggered on different conditions + An example showing how a "or logic" for conditions can be created, and one action can be triggered on different conditions - Some features used: + Some features used: - - ConditionGroup + - ConditionGroup - - Trigger + - Trigger - - TimeToCollisionCondition + - TimeToCollisionCondition - - TimeHeadwayCondition + - TimeHeadwayCondition - - AbsoluteSpeedAction + - AbsoluteSpeedAction """ diff --git a/examples/xosc/multiple_maneuvers.py b/examples/xosc/multiple_maneuvers.py index 3c512ed..38539d3 100644 --- a/examples/xosc/multiple_maneuvers.py +++ b/examples/xosc/multiple_maneuvers.py @@ -1,20 +1,20 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - An example setting up multiple vehicles triggering on eachother and running in parallel + An example setting up multiple vehicles triggering on eachother and running in parallel - Some features used: + Some features used: - - AbsoluteLaneChangeAction + - AbsoluteLaneChangeAction - - TimeHeadwayCondition + - TimeHeadwayCondition """ diff --git a/examples/xosc/one_action_example.py b/examples/xosc/one_action_example.py index 9a27e4d..ed05c50 100644 --- a/examples/xosc/one_action_example.py +++ b/examples/xosc/one_action_example.py @@ -1,19 +1,19 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Simple example showing how one vehicle triggers based on distance from another, then keeps distance to that car + Simple example showing how one vehicle triggers based on distance from another, then keeps distance to that car - Some features used: - - LongitudinalDistanceAction + Some features used: + - LongitudinalDistanceAction - - TimeHeadwayCondition + - TimeHeadwayCondition """ diff --git a/examples/xosc/parallel_distance_actions.py b/examples/xosc/parallel_distance_actions.py index 2e1777a..aa241b7 100644 --- a/examples/xosc/parallel_distance_actions.py +++ b/examples/xosc/parallel_distance_actions.py @@ -1,24 +1,24 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Simple example showing how one vehicle triggers two different actions based on different distance related triggers + Simple example showing how one vehicle triggers two different actions based on different distance related triggers - Some features used: + Some features used: - - ReachPositionCondition + - ReachPositionCondition - - RelativeDistanceCondition + - RelativeDistanceCondition - - RelativeLaneChangeAction + - RelativeLaneChangeAction - - AbsoluteSpeedAction + - AbsoluteSpeedAction """ import os diff --git a/examples/xosc/route_in_crossing.py b/examples/xosc/route_in_crossing.py index d643ebb..42f1be7 100644 --- a/examples/xosc/route_in_crossing.py +++ b/examples/xosc/route_in_crossing.py @@ -1,22 +1,22 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Simple example showing how to pick a route in a junction + Simple example showing how to pick a route in a junction - Some features used: + Some features used: - - Route + - Route - - AssignRouteAction + - AssignRouteAction - - LanePosition + - LanePosition """ import os diff --git a/examples/xosc/speed_profile.py b/examples/xosc/speed_profile.py index d73b4f8..9f54844 100644 --- a/examples/xosc/speed_profile.py +++ b/examples/xosc/speed_profile.py @@ -1,11 +1,11 @@ """ - An example showing how to create a trajector based on polyline - Also shows how to create a vehicle from start +An example showing how to create a trajector based on polyline +Also shows how to create a vehicle from start - Some features used: +Some features used: - - SpeedProfileAction +- SpeedProfileAction """ diff --git a/examples/xosc/syncronize_straight_example.py b/examples/xosc/syncronize_straight_example.py index ca74666..db3d29f 100644 --- a/examples/xosc/syncronize_straight_example.py +++ b/examples/xosc/syncronize_straight_example.py @@ -1,19 +1,19 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - Example of a synchronizing two vehicles at one point + Example of a synchronizing two vehicles at one point - Some features used: + Some features used: - - AbsoluteSynchronizeAction + - AbsoluteSynchronizeAction """ diff --git a/examples/xosc/trajectory_example.py b/examples/xosc/trajectory_example.py index 8c63353..68bc53b 100644 --- a/examples/xosc/trajectory_example.py +++ b/examples/xosc/trajectory_example.py @@ -1,27 +1,27 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - An example showing how to create a trajector based on polyline - Also shows how to create a vehicle from start + An example showing how to create a trajector based on polyline + Also shows how to create a vehicle from start - Some features used: + Some features used: - - RelativeLanePosition + - RelativeLanePosition - - Polyline + - Polyline - - Trajectory + - Trajectory - - TimeHeadwayCondition + - TimeHeadwayCondition - - FollowTrajectoryAction + - FollowTrajectoryAction """ diff --git a/examples/xosc/withcontroller.py b/examples/xosc/withcontroller.py index eb31529..f46a1da 100644 --- a/examples/xosc/withcontroller.py +++ b/examples/xosc/withcontroller.py @@ -1,21 +1,21 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - An example how to add a sumo controller to an object + An example how to add a sumo controller to an object - Some features used: + Some features used: - - Controller + - Controller - - Properties + - Properties """ diff --git a/scenariogeneration/__init__.py b/scenariogeneration/__init__.py index 4a105bd..8ed256d 100644 --- a/scenariogeneration/__init__.py +++ b/scenariogeneration/__init__.py @@ -1,7 +1,5 @@ # __init__.py -""" The Python scenariogeneration package is a collection of libraries for generating OpenSCENARIO (.xosc) and OpenDRIVE (.xodr) XML files. - -""" +"""The Python scenariogeneration package is a collection of libraries for generating OpenSCENARIO (.xosc) and OpenDRIVE (.xodr) XML files.""" from .scenario_generator import * from .helpers import * from .esmini_runner import * diff --git a/scenariogeneration/esmini_runner.py b/scenariogeneration/esmini_runner.py index 34dec0c..cecbb7f 100644 --- a/scenariogeneration/esmini_runner.py +++ b/scenariogeneration/esmini_runner.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/helpers.py b/scenariogeneration/helpers.py index 866ea62..ed11415 100644 --- a/scenariogeneration/helpers.py +++ b/scenariogeneration/helpers.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/scenario_generator.py b/scenariogeneration/scenario_generator.py index a044b85..9734a10 100644 --- a/scenariogeneration/scenario_generator.py +++ b/scenariogeneration/scenario_generator.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xodr/__init__.py b/scenariogeneration/xodr/__init__.py index 430c419..2135717 100644 --- a/scenariogeneration/xodr/__init__.py +++ b/scenariogeneration/xodr/__init__.py @@ -1,7 +1,5 @@ # __init__.py -""" the xodr module contains the classes used to generate OpenDRIVE (xml) files. - -""" +"""the xodr module contains the classes used to generate OpenDRIVE (xml) files.""" from .geometry import * from .opendrive import * from .lane import * diff --git a/scenariogeneration/xodr/elevation.py b/scenariogeneration/xodr/elevation.py index 671d663..586e704 100644 --- a/scenariogeneration/xodr/elevation.py +++ b/scenariogeneration/xodr/elevation.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xodr/enumerations.py b/scenariogeneration/xodr/enumerations.py index e316ca0..d59931e 100644 --- a/scenariogeneration/xodr/enumerations.py +++ b/scenariogeneration/xodr/enumerations.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xodr/exceptions.py b/scenariogeneration/xodr/exceptions.py index c11f2a1..710bb33 100644 --- a/scenariogeneration/xodr/exceptions.py +++ b/scenariogeneration/xodr/exceptions.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xodr/generators.py b/scenariogeneration/xodr/generators.py index d3f1819..69775fa 100644 --- a/scenariogeneration/xodr/generators.py +++ b/scenariogeneration/xodr/generators.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xodr/geometry.py b/scenariogeneration/xodr/geometry.py index ff22de9..cd83ee9 100644 --- a/scenariogeneration/xodr/geometry.py +++ b/scenariogeneration/xodr/geometry.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xodr/junction_creator.py b/scenariogeneration/xodr/junction_creator.py index 1d7bb8e..95cdd30 100644 --- a/scenariogeneration/xodr/junction_creator.py +++ b/scenariogeneration/xodr/junction_creator.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xodr/lane.py b/scenariogeneration/xodr/lane.py index 777055e..3c2f2ea 100644 --- a/scenariogeneration/xodr/lane.py +++ b/scenariogeneration/xodr/lane.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xodr/lane_def.py b/scenariogeneration/xodr/lane_def.py index 80a88b3..256e6ab 100644 --- a/scenariogeneration/xodr/lane_def.py +++ b/scenariogeneration/xodr/lane_def.py @@ -1,15 +1,15 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. - This is a collection methods and classes not related to OpenDRIVE, but relates to automation of lane creations + This is a collection methods and classes not related to OpenDRIVE, but relates to automation of lane creations """ diff --git a/scenariogeneration/xodr/links.py b/scenariogeneration/xodr/links.py index ea2b487..4ba7bc1 100644 --- a/scenariogeneration/xodr/links.py +++ b/scenariogeneration/xodr/links.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xodr/opendrive.py b/scenariogeneration/xodr/opendrive.py index d45c7da..c535fe4 100644 --- a/scenariogeneration/xodr/opendrive.py +++ b/scenariogeneration/xodr/opendrive.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xodr/signals_objects.py b/scenariogeneration/xodr/signals_objects.py index d9f0717..c8859dd 100644 --- a/scenariogeneration/xodr/signals_objects.py +++ b/scenariogeneration/xodr/signals_objects.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xodr/utils.py b/scenariogeneration/xodr/utils.py index 262cb46..49dc845 100644 --- a/scenariogeneration/xodr/utils.py +++ b/scenariogeneration/xodr/utils.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xosc/__init__.py b/scenariogeneration/xosc/__init__.py index 0110a9a..64a77ac 100644 --- a/scenariogeneration/xosc/__init__.py +++ b/scenariogeneration/xosc/__init__.py @@ -1,13 +1,13 @@ # __init__.py """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. - - Copyright (c) 2022 The scenariogeneration Authors. +scenariogeneration +https://github.com/pyoscx/scenariogeneration + +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. + +Copyright (c) 2022 The scenariogeneration Authors. """ from .utils import * diff --git a/scenariogeneration/xosc/actions.py b/scenariogeneration/xosc/actions.py index e42909d..e656a16 100644 --- a/scenariogeneration/xosc/actions.py +++ b/scenariogeneration/xosc/actions.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xosc/entities.py b/scenariogeneration/xosc/entities.py index 5c84021..b48bc4e 100644 --- a/scenariogeneration/xosc/entities.py +++ b/scenariogeneration/xosc/entities.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xosc/enumerations.py b/scenariogeneration/xosc/enumerations.py index 4ee94d4..d106412 100644 --- a/scenariogeneration/xosc/enumerations.py +++ b/scenariogeneration/xosc/enumerations.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xosc/exceptions.py b/scenariogeneration/xosc/exceptions.py index eb53182..a223671 100644 --- a/scenariogeneration/xosc/exceptions.py +++ b/scenariogeneration/xosc/exceptions.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. - - Copyright (c) 2022 The scenariogeneration Authors. +scenariogeneration +https://github.com/pyoscx/scenariogeneration + +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. + +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xosc/parameters.py b/scenariogeneration/xosc/parameters.py index 7fa65ca..378f7e5 100644 --- a/scenariogeneration/xosc/parameters.py +++ b/scenariogeneration/xosc/parameters.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xosc/position.py b/scenariogeneration/xosc/position.py index e4ff3e6..65d0c0c 100644 --- a/scenariogeneration/xosc/position.py +++ b/scenariogeneration/xosc/position.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xosc/scenario.py b/scenariogeneration/xosc/scenario.py index b51e988..df0dc7e 100644 --- a/scenariogeneration/xosc/scenario.py +++ b/scenariogeneration/xosc/scenario.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xosc/storyboard.py b/scenariogeneration/xosc/storyboard.py index 7736355..abcef29 100644 --- a/scenariogeneration/xosc/storyboard.py +++ b/scenariogeneration/xosc/storyboard.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xosc/triggers.py b/scenariogeneration/xosc/triggers.py index 0b9e222..7d0b0dd 100644 --- a/scenariogeneration/xosc/triggers.py +++ b/scenariogeneration/xosc/triggers.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/scenariogeneration/xosc/utils.py b/scenariogeneration/xosc/utils.py index 8cec5fd..6eb1526 100644 --- a/scenariogeneration/xosc/utils.py +++ b/scenariogeneration/xosc/utils.py @@ -1,17 +1,17 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ import os - +import warnings from .exceptions import OpenSCENARIOVersionError, NotAValidElement import xml.etree.ElementTree as ET @@ -1892,7 +1892,7 @@ def __init__(self, prettyprint=True, encoding="utf-8"): self.filename = "" self.encoding = encoding - def add_to_catalog(self, obj, osc_minor_version=_MINOR_VERSION): + def add_to_catalog(self, obj): """add_to_catalog adds an element to the catalog Parameters @@ -1905,9 +1905,9 @@ def add_to_catalog(self, obj, osc_minor_version=_MINOR_VERSION): if self.catalog_element == None: OSError("No file has been created or opened") fileheader = self.catalog_element.find("FileHeader") - self.version_minor = osc_minor_version - if fileheader.attrib["revMinor"] != osc_minor_version: - Warning( + + if convert_int(fileheader.attrib["revMinor"]) != obj.version_minor: + warnings.warn( "The Catalog and the added object does not have the same OpenSCENARIO version." ) catalogs = self.catalog_element.find("Catalog") @@ -1964,8 +1964,7 @@ def create_catalog_element(self, catalogtype, description, author): "xsi:noNamespaceSchemaLocation": "../../" + XSI, }, ) - # header = FileHeader(description, author) - header = FileHeader(author, description) + header = FileHeader(author, description, revMinor=self.version_minor) element.append(header.get_element()) ET.SubElement(element, "Catalog", attrib={"name": catalogtype}) diff --git a/scenariogeneration/xosc/xosc_reader.py b/scenariogeneration/xosc/xosc_reader.py index ca7ae4e..27b9278 100644 --- a/scenariogeneration/xosc/xosc_reader.py +++ b/scenariogeneration/xosc/xosc_reader.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. - - Copyright (c) 2022 The scenariogeneration Authors. +scenariogeneration +https://github.com/pyoscx/scenariogeneration + +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. + +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_actions.py b/tests/test_actions.py index ffd1e79..8aa4bdc 100644 --- a/tests/test_actions.py +++ b/tests/test_actions.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_catalog.py b/tests/test_catalog.py index 447fa58..bfd26ba 100644 --- a/tests/test_catalog.py +++ b/tests/test_catalog.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. - - Copyright (c) 2022 The scenariogeneration Authors. +scenariogeneration +https://github.com/pyoscx/scenariogeneration + +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. + +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_elevation.py b/tests/test_elevation.py index 3b4dd18..b9d18a1 100644 --- a/tests/test_elevation.py +++ b/tests/test_elevation.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_entities.py b/tests/test_entities.py index 79d1930..e9d92f3 100644 --- a/tests/test_entities.py +++ b/tests/test_entities.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_generators.py b/tests/test_generators.py index a80c891..b13de35 100644 --- a/tests/test_generators.py +++ b/tests/test_generators.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_geometry.py b/tests/test_geometry.py index 3474644..00b3c47 100644 --- a/tests/test_geometry.py +++ b/tests/test_geometry.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_lane.py b/tests/test_lane.py index 2f49c4f..30ad035 100644 --- a/tests/test_lane.py +++ b/tests/test_lane.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_links.py b/tests/test_links.py index acc1433..3a02dd2 100644 --- a/tests/test_links.py +++ b/tests/test_links.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_odr_utils.py b/tests/test_odr_utils.py index a0a86e2..2321f4d 100644 --- a/tests/test_odr_utils.py +++ b/tests/test_odr_utils.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_opendrive.py b/tests/test_opendrive.py index 77e8918..894823b 100644 --- a/tests/test_opendrive.py +++ b/tests/test_opendrive.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_parameters.py b/tests/test_parameters.py index bfdca9a..d598ee1 100644 --- a/tests/test_parameters.py +++ b/tests/test_parameters.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_position.py b/tests/test_position.py index fc8e307..07a7ed2 100644 --- a/tests/test_position.py +++ b/tests/test_position.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_reader.py b/tests/test_reader.py index 7adf9c4..d221532 100644 --- a/tests/test_reader.py +++ b/tests/test_reader.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_scenario.py b/tests/test_scenario.py index 35406e9..f92f312 100644 --- a/tests/test_scenario.py +++ b/tests/test_scenario.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_scenario_generator.py b/tests/test_scenario_generator.py index 1b4cbf8..8f84535 100644 --- a/tests/test_scenario_generator.py +++ b/tests/test_scenario_generator.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_signals_objects.py b/tests/test_signals_objects.py index b914eb4..c78dd51 100644 --- a/tests/test_signals_objects.py +++ b/tests/test_signals_objects.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_storyboard.py b/tests/test_storyboard.py index 4a56c61..94fa76b 100644 --- a/tests/test_storyboard.py +++ b/tests/test_storyboard.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_triggers.py b/tests/test_triggers.py index 7b02371..6ea0bdf 100644 --- a/tests/test_triggers.py +++ b/tests/test_triggers.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ diff --git a/tests/test_utils.py b/tests/test_utils.py index 5df50dd..4d63230 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,12 +1,12 @@ """ - scenariogeneration - https://github.com/pyoscx/scenariogeneration +scenariogeneration +https://github.com/pyoscx/scenariogeneration - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at https://mozilla.org/MPL/2.0/. - Copyright (c) 2022 The scenariogeneration Authors. +Copyright (c) 2022 The scenariogeneration Authors. """ @@ -440,6 +440,7 @@ def test_controller(tmpdir): assert version_validation("Controller", cnt3, 1) == ValidationResponse.OK assert version_validation("Controller", cnt, 2) == ValidationResponse.OK assert version_validation("Controller", cnt, 1) == ValidationResponse.OSC_VERSION + cnt.setVersion(minor=2) cnt.dump_to_catalog( os.path.join(tmpdir, "my_catalog.xosc"), "ControllerCatalog", @@ -806,6 +807,7 @@ def test_environment(tmpdir): assert version_validation("Environment", env, 2) == ValidationResponse.OK assert version_validation("Environment", env5, 0) == ValidationResponse.OK assert version_validation("Environment", env6, 1) == ValidationResponse.OK + env.setVersion(minor=2) env.dump_to_catalog( os.path.join(tmpdir, "my_catalog.xosc"), "EnvironmentCatalog",