From de050abfcd26ce5c55fb73f76c5aa2cb0f34da2d Mon Sep 17 00:00:00 2001
From: Steven Lange <langestx@informatik.hu-berlin.de>
Date: Sat, 2 Dec 2017 10:04:23 +0100
Subject: [PATCH] =?UTF-8?q?Max.=20Beschleunigungscap=20mit=20v=5Fc=20=3D?=
=?UTF-8?q?=20v=5Fc*1.2=20eingef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/CACC/CACC-Module-Test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/CACC/CACC-Module-Test.py b/modules/CACC/CACC-Module-Test.py
index 74a8579b..2154f097 100644
--- a/modules/CACC/CACC-Module-Test.py
+++ b/modules/CACC/CACC-Module-Test.py
@@ -68,7 +68,7 @@ class Car(object):
else:
v_n = v_v + abs(PS-v_v)/4
else:
- v_n = (v_v * (d_c/IPD)**2) #Der Exponent gibt an, wie schnell die Aenderung umgesetzt werden soll
+ v_n = min((v_v * (d_c/IPD)**2), v_c*1.1) #Der Exponent gibt an, wie schnell die Aenderung umgesetzt werden soll
self.cSpeed = v_n
self.cIPD = self.IPD * 0.01 #too low
--
GitLab