Mercurial > hg > nsaunier > traffic-intelligence

comparison scripts/safety-analysis.py @ 387:91679eb2ff2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaning up safety analysis and the new traditional constant velocity method
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 24 Jul 2013 12:48:12 -0400
parents 619ae9a9a788
children 6551a3cf1750
comparison
equal deleted inserted replaced
386:8bc632cb8344 387:91679eb2ff2c
24 predictionMethod = args.predictionMethod 24 predictionMethod = args.predictionMethod
25 else: 25 else:
26 predictionMethod = params.predictionMethod 26 predictionMethod = params.predictionMethod
27 27
28 if predictionMethod == 'cvd': 28 if predictionMethod == 'cvd':
29 predictionParameters = prediction.CVDirectPredictionParameters(params.maxPredictedSpeed) 29 predictionParameters = prediction.CVDirectPredictionParameters()
30 elif predictionMethod == 'cv': 30 elif predictionMethod == 'cv':
31 predictionParameters = prediction.ConstantPredictionParameters(params.maxPredictedSpeed) 31 predictionParameters = prediction.ConstantPredictionParameters(params.maxPredictedSpeed)
32 elif predictionMethod == 'na': 32 elif predictionMethod == 'na':
33 predictionParameters = prediction.NormalAdaptationPredictionParameters(params.maxPredictedSpeed, 33 predictionParameters = prediction.NormalAdaptationPredictionParameters(params.maxPredictedSpeed,
34 params.nPredictedTrajectories, 34 params.nPredictedTrajectories,