Merge pull request #262 from pyoscx/260_fix_catalog_versions

260 fix catalog versions

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.
 """

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
 
 
 """

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
 
 
 """

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
 
 
 """

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

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

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

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
 
 """
 

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)
 
 """
 

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

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

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
 
 """