Mercurial > hg > nsaunier > traffic-intelligence

comparison scripts/safety-analysis.py @ 351:891858351bcb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added new parameter (use features) for safety analysis
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 27 Jun 2013 00:25:51 -0400
parents 7e9ad2d9d79c
children 72aa44072093
comparison
equal deleted inserted replaced
350:7e9ad2d9d79c 351:891858351bcb
23 constantVelocityPredictionParameters = prediction.ConstantPredictionParameters(params.maxPredictedSpeed) 23 constantVelocityPredictionParameters = prediction.ConstantPredictionParameters(params.maxPredictedSpeed)
24 24
25 normalAdaptationPredictionParameters = prediction.NormalAdaptationPredictionParameters(params.maxPredictedSpeed, 25 normalAdaptationPredictionParameters = prediction.NormalAdaptationPredictionParameters(params.maxPredictedSpeed,
26 params.nPredictedTrajectories, 26 params.nPredictedTrajectories,
27 params.maxAcceleration, 27 params.maxAcceleration,
28 params.maxSteering) 28 params.maxSteering,
29 params.useFeaturesForPrediction)
29 30
30 featurePredictionParameters = prediction.PointSetPredictionParameters(params.maxPredictedSpeed, params.nPredictedTrajectories) 31 featurePredictionParameters = prediction.PointSetPredictionParameters(params.maxPredictedSpeed,
32 params.nPredictedTrajectories)
31 33
32 evasiveActionPredictionParameters = prediction.EvasiveActionPredictionParameters(params.maxPredictedSpeed, 34 evasiveActionPredictionParameters = prediction.EvasiveActionPredictionParameters(params.maxPredictedSpeed,
33 params.nPredictedTrajectories, 35 params.nPredictedTrajectories,
34 params.minAcceleration, 36 params.minAcceleration,
35 params.maxAcceleration, 37 params.maxAcceleration,
36 params.maxSteering, 38 params.maxSteering,
37 False) 39 params.useFeaturesForPrediction)
38 40
39 featureEvasiveActionPredictionParameters = prediction.EvasiveActionPredictionParameters(params.maxPredictedSpeed, 41 featureEvasiveActionPredictionParameters = prediction.EvasiveActionPredictionParameters(params.maxPredictedSpeed,
40 params.nPredictedTrajectories, 42 params.nPredictedTrajectories,
41 params.minAcceleration, 43 params.minAcceleration,
42 params.maxAcceleration, 44 params.maxAcceleration,
43 params.maxSteering, 45 params.maxSteering,
44 True) 46 params.useFeaturesForPrediction)
45 47
46 48
47 49
48 objects = storage.loadTrajectoriesFromSqlite(params.databaseFilename,'object') 50 objects = storage.loadTrajectoriesFromSqlite(params.databaseFilename,'object')
49 # features = storage.loadTrajectoriesFromSqlite('amherst-10.sqlite','feature') # needed if normal adaptation 51 # features = storage.loadTrajectoriesFromSqlite('amherst-10.sqlite','feature') # needed if normal adaptation