diff --git a/Car.py b/Car.py
index 5be627d..585bae3 100644
--- a/Car.py
+++ b/Car.py
@@ -54,7 +54,7 @@ class Car():
self.gamma = 5
self.delta = 0
- self.T = 0.3
+ self.T = 1.3
self.size = 3
self.vroom = 0
@@ -124,7 +124,7 @@ class Car():
edgeInd+=1
carComing = self.getLeaderAtIntersection(prevInd,edgeInd)
if(carComing is not None):
- self.leaderDist = l+carComing[0]
+ self.leaderDist = l + 0.3*carComing[0]
return carComing[1]
if(not self.route[edgeInd].isSpecial()):
prevInd = edgeInd
@@ -228,10 +228,10 @@ class Car():
#painter.drawEllipse(pt,100,100)
def conduite(self,vmax,leader,dt):
- #if self.id == "f_00" and self.controller.t%10>5:
- #
- # self.v = 0
- # return
+ if self.id == "f_00" and self.controller.t%10>5:
+
+ self.v = 0
+ return
if(leader is None):
self.v = self.vmax
@@ -250,7 +250,7 @@ class Car():
# S = vleader * 3.6 * 0.6
- Si=self.leaderDist-vleader*1.3
+ 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)
diff --git a/mainLoop.py b/mainLoop.py
index 40a390a..e6b6d0a 100644
--- a/mainLoop.py
+++ b/mainLoop.py
@@ -88,7 +88,7 @@ class mainLoop(QObject):
def quickLoad(self):
self.map.fromPath("test7.net.xml")
self.painter.generateTransform()
- self.controller.fromPath("test12.rou.xml")
+ self.controller.fromPath("test13.rou.xml")
self.controller.prepareRoute()
def updateFps(self):
diff --git a/test13.rou.xml b/test13.rou.xml
new file mode 100644
index 0000000..6891222
--- /dev/null
+++ b/test13.rou.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test14.rou.xml b/test14.rou.xml
new file mode 100644
index 0000000..122f469
--- /dev/null
+++ b/test14.rou.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test15.rou.xml b/test15.rou.xml
new file mode 100644
index 0000000..4513405
--- /dev/null
+++ b/test15.rou.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test8.net.xml b/test8.net.xml
new file mode 100644
index 0000000..ddb9102
--- /dev/null
+++ b/test8.net.xml
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+