leo/IRESTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

la propriétée "depart" est maintenant respectée

Browse Source
This commit is contained in:
leo 2022-02-27 13:34:36 +01:00
parent 237bf6c2b9
commit a624ba4b17
Signed by: leo
GPG Key ID: 0DD993BFB2B307DB
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Car.py
View File

@ -35,7 +35,7 @@ class Car():
#print(f"{self.id} : {startEdge.getID()} -> {nextEdge.getID()} via {laneId}") #print(f"{self.id} : {startEdge.getID()} -> {nextEdge.getID()} via {laneId}")
def __init__(self,carID,route,parentMap,parentController,infoWidg): def __init__(self,carID,route,startTime,parentMap,parentController,infoWidg):
self.id=carID self.id=carID
self.map=parentMap self.map=parentMap
self.controller=parentController self.controller=parentController
@ -46,6 +46,8 @@ class Car():
self.laneShape=None self.laneShape=None
self.laneId=0 self.laneId=0
self.leader=None self.leader=None
self.startTime=float(startTime)
self.signals=updateSignals() self.signals=updateSignals()
self.signals.updateDisp.connect(self.infoWidg.setVal) self.signals.updateDisp.connect(self.infoWidg.setVal)
self.signals.addGraphPt.connect(self.infoWidg.addSpeedPoint) self.signals.addGraphPt.connect(self.infoWidg.addSpeedPoint)
@ -166,6 +168,9 @@ class Car():
self.signals.addGraphPt.emit((1,self.controller.t,vsec)) self.signals.addGraphPt.emit((1,self.controller.t,vsec))
def update(self,dt): def update(self,dt):
if self.controller.t < self.startTime:
return
self.leader=self.getLeader(100) self.leader=self.getLeader(100)
self.conduite(self.vmax,self.leader,dt) self.conduite(self.vmax,self.leader,dt)

4
CarController.py
View File

@ -84,7 +84,7 @@ class CarController:
for vehicle in sumolib.xml.parse(path,"vehicle"): for vehicle in sumolib.xml.parse(path,"vehicle"):
route=vehicle.route[0].edges.split() route=vehicle.route[0].edges.split()
wId=self.infoWidget.addItem(carInfo(self.infoWidget), vehicle.id) wId=self.infoWidget.addItem(carInfo(self.infoWidget), vehicle.id)
self.cars.append(Car(vehicle.id,route,self.map,self,self.infoWidget.widget(wId))) self.cars.append(Car(vehicle.id,route,vehicle.depart,self.map,self,self.infoWidget.widget(wId)))
def prepareRoute(self): def prepareRoute(self):
for car in self.cars: for car in self.cars:
@ -100,7 +100,7 @@ class CarController:
def update(self): def update(self):
if self.map.net is None: if self.map.net is None:
return return
self.t+=1 self.t+=1/60
for car in self.cars: for car in self.cars:
car.update(1.0/60) car.update(1.0/60)

12
test5.rou.xml
View File

@ -44,22 +44,22 @@
<vehicle id="vehicle_0" depart="0.00"> <vehicle id="vehicle_0" depart="0.00">
<route edges="gneE13 gneE16 gneE19 gneE22 gneE23 gneE31" color="cyan"/> <route edges="gneE13 gneE16 gneE19 gneE22 gneE23 gneE31" color="cyan"/>
</vehicle> </vehicle>
<vehicle id="vehicle_1" depart="0.00"> <vehicle id="vehicle_1" depart="1.00">
<route edges="gneE13 gneE16 gneE26 gneE20 gneE23 gneE31" color="cyan"/> <route edges="gneE13 gneE16 gneE26 gneE20 gneE23 gneE31" color="cyan"/>
</vehicle> </vehicle>
<vehicle id="vehicle_2" depart="0.00"> <vehicle id="vehicle_2" depart="2.00">
<route edges="gneE13 gneE24 gneE17 gneE20 gneE23 gneE31" color="cyan"/> <route edges="gneE13 gneE24 gneE17 gneE20 gneE23 gneE31" color="cyan"/>
</vehicle> </vehicle>
<vehicle id="vehicle_3" depart="0.00"> <vehicle id="vehicle_3" depart="3.00">
<route edges="gneE14 gneE17 gneE20 gneE23 gneE31" color="cyan"/> <route edges="gneE14 gneE17 gneE20 gneE23 gneE31" color="cyan"/>
</vehicle> </vehicle>
<vehicle id="vehicle_4" depart="0.00"> <vehicle id="vehicle_4" depart="4.00">
<route edges="gneE14 gneE28 gneE18 gneE21 gneE23 gneE31" color="cyan"/> <route edges="gneE14 gneE28 gneE18 gneE21 gneE23 gneE31" color="cyan"/>
</vehicle> </vehicle>
<vehicle id="vehicle_5" depart="0.00"> <vehicle id="vehicle_5" depart="5.00">
<route edges="gneE14 gneE17 gneE27 gneE21 gneE23 gneE31" color="cyan"/> <route edges="gneE14 gneE17 gneE27 gneE21 gneE23 gneE31" color="cyan"/>
</vehicle> </vehicle>
<vehicle id="vehicle_6" depart="0.00"> <vehicle id="vehicle_6" depart="6.00">
<route edges="gneE15 gneE18 gneE21 gneE23 gneE31" color="cyan"/> <route edges="gneE15 gneE18 gneE21 gneE23 gneE31" color="cyan"/>
</vehicle> </vehicle>
</routes> </routes>