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

interMinSpace

Browse Source
This commit is contained in:
leo 2022-05-12 22:50:23 +02:00
parent e8bb5ee157
commit 71c04d224b
Signed by: leo
GPG Key ID: 0DD993BFB2B307DB
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Car.py
View File

@ -55,7 +55,8 @@ class Car():
self.v=0 self.v=0
self.a=10 self.a=10
self.b=20 self.b=20
self.minSpace=10 self.minSpace=5
self.interMinSpace=20
self.leaderBefore=False self.leaderBefore=False
self.distToInter=0 self.distToInter=0
self.timeStopped=0 self.timeStopped=0
@ -421,7 +422,7 @@ class Car():
# ou si on as le temps d'arriver à l'intersection avant le leader (plus un marge pour garder un distance de sécu) # ou si on as le temps d'arriver à l'intersection avant le leader (plus un marge pour garder un distance de sécu)
# alors on accelere pour s'inserer # alors on accelere pour s'inserer
#print(tti, leader.T, marg, ltti) #print(tti, leader.T, marg, ltti)
if self.distToInter > self.minSpace + dts or self.distToInter < 5 or (tti + leader.T + marg) < ltti: if self.distToInter > self.interMinSpace + dts or self.distToInter < 5 or (tti + leader.T + marg) < ltti:
self.v = min(vmax, self.v + self.a*dt) self.v = min(vmax, self.v + self.a*dt)
#print(self.id, "ca passe") #print(self.id, "ca passe")
else:# sinon on freine else:# sinon on freine