Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove extra lines #1074

Merged
merged 1 commit into from
Apr 19, 2024
Merged

Remove extra lines #1074

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions srunner/scenarioconfigs/osc2_scenario_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@

from srunner.osc2_stdlib.path import Path

<<<<<<< HEAD
# pylint: disable=line-too-long
from srunner.scenarioconfigs.scenario_configuration import ScenarioConfiguration
=======
'''
Parses the osc2 scenario description file, generates type objects in the standard
library based on the type and keep constraint parameters, and sets parameters
>>>>>>> fd07c11... fix: removed empty files and translated Chinese to English
'''

# pylint: enable=line-too-long
from srunner.scenariomanager.carla_data_provider import CarlaDataProvider
Expand Down Expand Up @@ -163,10 +161,7 @@ def visit_parameter_declaration(self, node: ast_node.ParameterDeclaration):
vehicle_class = getattr(vehicles, para_type)
v_ins = vehicle_class()

<<<<<<< HEAD
# TODO: Analyzing and setting vehicle configuration parameters requires parsing the keep statement
=======
>>>>>>> fd07c11... fix: removed empty files and translated Chinese to English
v_ins.set_name(para_name)
if para_name == OSC2Helper.ego_name:
self.father_ins.add_ego_vehicles(v_ins)
Expand Down
Loading