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

apf ça degage

Browse Source
This commit is contained in:
leo 2022-05-14 16:47:48 +02:00
parent 4af345ed2b
commit a7de2f3974
Signed by: leo
GPG Key ID: 0DD993BFB2B307DB
1 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Car.py
View File

@ -368,60 +368,6 @@ class Car():
#elSize = self.v * self.T
#painter.drawEllipse(pt,elSize, elSize)
def conduite(self,vmax,leader,dt):
"""if self.id == "f_00" and self.controller.t%10>5:
self.v = 0
return
"""
if(leader is None):
self.v = vmax
self.updateGraph(self.v, vmax, 0, 0)
return
vleader=50#self.v
bleader=self.b
else:
vleader=leader.v # vitesse de la voiture leader
bleader=leader.b
if(self.leaderBefore):
if(vleader == 0):
return
if(self.distToInter > (self.T * vmax) or ((self.distToInter / vmax) < (self.leaderDist / vleader) - 2 * self.T)):
self.v=vmax
else:
self.v = 0
self.updateGraph(self.v, vmax, 0)
return
vbar=(self.v+vleader)/2
bbar=(bleader+self.b)/2
# S = vleader * 3.6 * 0.6
Si=self.leaderDist-vleader*self.T
#S=vf**2 / self.b + vleader**2 / bleader + self.gamma * vf + self.delta
T=self.T
vsec=vleader+(Si-vmax*T)/(vbar/bbar+T)
vd=min(self.v+self.a*dt,vmax,vsec)
#vf=min(va,vb2)
#va=self.v+2.5*self.a*self.T*(1-(self.v/vd))*sqrt(0.025+(self.v/vd))
#vb2=self.b*self.T+sqrt((self.b)**2*(self.T)**2-self.b*(2*(S-Si)-self.v*self.T-((vleader)**2/bbar)))
self.v=max(0,vd)
self.updateGraph(self.v, vmax, vsec)
def conduiteGipps(self, dt): #Nope
Va = self.v + 2.5 * self.a * dt * (1 - self.v/self.vmax) * sqrt(0.025 + self.v/self.vmax)
#Vb = self.b * dt + sqrt(self.b**2 * dt**2 - self.b * )
def calcTti(self, dist, v0, vmax, a):
ttms = (vmax - v0)/a # "time to max speed", temps pris par la voiture pour atteindre la vmax à partir de sa vitesse actuelle
delta = v0**2 + 2*a*dist # delta du trinome qui donne le temps mis pour traverser la distance dist