Mercurial > hg > nsaunier > traffic-intelligence
changeset 789:3666342dabe2 dev
minor changes
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Wed, 30 Mar 2016 15:39:53 -0400 |
| parents | 5b970a5bc233 |
| children | 944949c8ef3e |
| files | python/traffic_engineering.py |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/python/traffic_engineering.py Thu Mar 24 16:37:37 2016 -0400 +++ b/python/traffic_engineering.py Wed Mar 30 15:39:53 2016 -0400 @@ -260,7 +260,9 @@ ######################### def timeChangingSpeed(v0, vf, a, TPR): - return TPR+(vf-v0)/a + 'for decelerations, a < 0' + return TPR-(vf-v0)/a def distanceChangingSpeed(v0, vf, a, TPR): - return TPR*v0+(vf*vf-v0*v0)/(2*a) + 'for decelerations, a < 0' + return TPR*v0-(vf**2-v0**2)/(2*a)