p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix codacy warnings

This commit is contained in:
Joel Moriana 2020-03-27 13:01:08 +01:00 committed by bernat
parent 62de816eb7
commit 4142fbb3a1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Co-Simulation/PTV-Vissim/vissim_integration/vissim_simulation.py
View File

@ -86,8 +86,8 @@ class VissimVehicle(object):
VissimVehicle holds the data relative to traffic vehicles in vissim. VissimVehicle holds the data relative to traffic vehicles in vissim.
""" """
def __init__(self, def __init__(self,
id, vehicle_id,
type, type_id,
model_filename, model_filename,
color, color,
location, location,
@ -95,8 +95,8 @@ class VissimVehicle(object):
velocity, velocity,
lights_state=VissimLightState.NONE): lights_state=VissimLightState.NONE):
# Static parameters. # Static parameters.
self.id = id self.id = vehicle_id
self.type = type self.type = type_id
self.model_filename = model_filename self.model_filename = model_filename
self.color = color self.color = color
@ -219,7 +219,6 @@ class PTVVissimSimulation(object):
:param carla.Vector3D velocity: new vehicle velocity. :param carla.Vector3D velocity: new vehicle velocity.
:return: True if successfully updated. Otherwise, False. :return: True if successfully updated. Otherwise, False.
""" """
assert vehicle_id in self._simulator_vehicles
self._simulator_vehicles[vehicle_id] = Simulator_Veh_Data( self._simulator_vehicles[vehicle_id] = Simulator_Veh_Data(
transform.location.x, transform.location.y, transform.location.z, transform.location.x, transform.location.y, transform.location.z,
math.radians(transform.rotation.yaw), math.radians(transform.rotation.pitch), math.radians(transform.rotation.yaw), math.radians(transform.rotation.pitch),
@ -259,7 +258,6 @@ class PTVVissimSimulation(object):
vehicles = {} vehicles = {}
for i in range(num_vehicles.value): for i in range(num_vehicles.value):
vehicle_data = traffic_data[i] vehicle_data = traffic_data[i]
assert vehicle_data.VehicleID > self._max_simulator_vehicles
vehicles[vehicle_data.VehicleID] = VissimVehicle( vehicles[vehicle_data.VehicleID] = VissimVehicle(
vehicle_data.VehicleID, vehicle_data.VehicleType, vehicle_data.ModelFileName, vehicle_data.VehicleID, vehicle_data.VehicleType, vehicle_data.ModelFileName,